From 35f184982e308f66ec62030acc4196ab5c972288 Mon Sep 17 00:00:00 2001 From: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com> Date: Mon, 30 Dec 2024 12:37:16 -0800 Subject: [PATCH] Move protobuf definitions under core package (#3181) This PR moves all definitions of protobuf under workflow-core to be within the core package name. --- .../architecture/rpc/controlcommands.proto | 54 +++++++++---------- .../sendsemantics/partitionings.proto | 13 +++-- .../architecture/worker/statistics.proto | 4 +- .../amber/engine/common/ambermessage.proto | 6 +-- .../engine/common/executionruntimestate.proto | 20 +++---- .../amber/clustering/ClusterListener.scala | 6 +-- .../common/AkkaActorRefMappingService.scala | 2 +- .../common/AkkaActorService.scala | 2 +- .../common/AkkaMessageTransferService.scala | 2 +- .../architecture/common/AmberProcessor.scala | 2 +- .../common/ProcessingStepCursor.scala | 2 +- .../architecture/common/WorkflowActor.scala | 2 +- .../architecture/controller/ClientEvent.scala | 2 +- .../architecture/controller/Controller.scala | 2 +- ...ControllerAsyncRPCHandlerInitializer.scala | 2 +- .../controller/ControllerProcessor.scala | 2 +- .../controller/GlobalReplayManager.scala | 2 +- .../controller/WorkflowScheduler.scala | 2 +- .../controller/execution/LinkExecution.scala | 2 +- .../execution/OperatorExecution.scala | 4 +- .../execution/RegionExecution.scala | 4 +- .../execution/WorkflowExecution.scala | 2 +- .../ChannelMarkerHandler.scala | 2 +- .../promisehandlers/DebugCommandHandler.scala | 2 +- .../EvaluatePythonExpressionHandler.scala | 2 +- .../promisehandlers/PauseHandler.scala | 2 +- .../RetrieveWorkflowStateHandler.scala | 2 +- .../TakeGlobalCheckpointHandler.scala | 2 +- .../layer/WorkerExecution.scala | 2 +- .../logreplay/EmptyReplayLogger.scala | 2 +- .../logreplay/OrderEnforcer.scala | 2 +- .../logreplay/ReplayLogGenerator.scala | 2 +- .../logreplay/ReplayLogManager.scala | 2 +- .../architecture/logreplay/ReplayLogger.scala | 2 +- .../logreplay/ReplayLoggerImpl.scala | 2 +- .../logreplay/ReplayOrderEnforcer.scala | 2 +- .../messaginglayer/AmberFIFOChannel.scala | 4 +- .../messaginglayer/InputGateway.scala | 2 +- .../messaginglayer/InputManager.scala | 4 +- .../messaginglayer/NetworkInputGateway.scala | 2 +- .../messaginglayer/NetworkOutputGateway.scala | 2 +- .../messaginglayer/OutputManager.scala | 4 +- .../messaginglayer/WorkerPort.scala | 2 +- .../pythonworker/PythonProxyClient.scala | 2 +- .../pythonworker/PythonProxyServer.scala | 2 +- .../pythonworker/PythonWorkflowWorker.scala | 2 +- .../WorkerBatchInternalQueue.scala | 2 +- .../CostBasedScheduleGenerator.scala | 4 +- .../ExpansionGreedyScheduleGenerator.scala | 4 +- .../architecture/scheduling/Region.scala | 4 +- .../RegionExecutionCoordinator.scala | 2 +- .../architecture/scheduling/RegionPlan.scala | 2 +- .../scheduling/ScheduleGenerator.scala | 4 +- .../WorkflowExecutionCoordinator.scala | 2 +- .../scheduling/config/ChannelConfig.scala | 4 +- .../scheduling/config/LinkConfig.scala | 2 +- .../scheduling/config/ResourceConfig.scala | 4 +- .../scheduling/config/WorkerConfig.scala | 2 +- .../resourcePolicies/ResourceAllocator.scala | 4 +- .../partitioners/BroadcastPartitioner.scala | 2 +- .../HashBasedShufflePartitioner.scala | 2 +- .../partitioners/OneToOnePartitioner.scala | 2 +- .../partitioners/Partitioner.scala | 2 +- .../RangeBasedShufflePartitioner.scala | 2 +- .../partitioners/RoundRobinPartitioner.scala | 2 +- .../worker/ChannelMarkerManager.scala | 2 +- .../engine/architecture/worker/DPThread.scala | 2 +- .../architecture/worker/DataProcessor.scala | 4 +- .../DataProcessorRPCHandlerInitializer.scala | 2 +- .../architecture/worker/PauseManager.scala | 2 +- .../architecture/worker/PauseType.scala | 2 +- .../architecture/worker/WorkflowWorker.scala | 2 +- .../managers/SerializationManager.scala | 4 +- .../worker/managers/StatisticsManager.scala | 2 +- .../PrepareCheckpointHandler.scala | 2 +- .../worker/promisehandlers/StartHandler.scala | 4 +- .../amber/engine/common/AmberLogging.scala | 2 +- .../engine/common/CheckpointSupport.scala | 2 +- .../common/ambermessage/RecoveryPayload.scala | 2 +- .../common/ambermessage/WorkflowMessage.scala | 2 +- .../engine/common/client/ClientActor.scala | 2 +- .../engine/common/rpc/AsyncRPCClient.scala | 2 +- .../rpc/AsyncRPCHandlerInitializer.scala | 2 +- .../engine/common/rpc/AsyncRPCServer.scala | 2 +- .../common/statetransition/StateManager.scala | 2 +- .../statetransition/WorkerStateManager.scala | 2 +- .../engine/common/virtualidentity/util.scala | 2 +- .../edu/uci/ics/amber/error/ErrorUtils.scala | 2 +- .../ics/texera/web/ComputingUnitMaster.scala | 2 +- .../websocket/event/WorkflowErrorEvent.scala | 2 +- .../resource/WorkflowWebsocketResource.scala | 6 +-- .../workflow/WorkflowExecutionsResource.scala | 2 +- .../web/service/ExecutionConsoleService.scala | 2 +- .../web/service/ExecutionResultService.scala | 6 +-- .../web/service/ExecutionRuntimeService.scala | 2 +- .../web/service/ExecutionStatsService.scala | 4 +- .../ExecutionsMetadataPersistService.scala | 2 +- .../FriesReconfigurationAlgorithm.scala | 2 +- .../web/service/ResultExportService.scala | 4 +- .../texera/web/service/WorkflowService.scala | 6 +-- .../ExecutionReconfigurationStore.scala | 2 +- .../uci/ics/texera/workflow/LogicalLink.scala | 4 +- .../uci/ics/texera/workflow/LogicalPlan.scala | 2 +- .../texera/workflow/WorkflowCompiler.scala | 6 +-- .../control/TrivialControlSpec.scala | 2 +- .../control/utils/MultiCallHandler.scala | 2 +- .../TesterAsyncRPCHandlerInitializer.scala | 2 +- .../control/utils/TrivialControlTester.scala | 2 +- .../NetworkInputGatewaySpec.scala | 2 +- .../messaginglayer/OutputManagerSpec.scala | 4 +- .../RangeBasedShuffleSpec.scala | 2 +- .../PythonWorkflowWorkerSpec.scala | 2 +- .../CostBasedScheduleGeneratorSpec.scala | 2 +- ...ExpansionGreedyScheduleGeneratorSpec.scala | 4 +- .../architecture/worker/DPThreadSpec.scala | 4 +- .../worker/DataProcessorSpec.scala | 4 +- .../architecture/worker/WorkerSpec.scala | 4 +- .../engine/e2e/BatchSizePropagationSpec.scala | 2 +- .../amber/engine/e2e/DataProcessingSpec.scala | 4 +- .../uci/ics/amber/engine/e2e/PauseSpec.scala | 2 +- .../faulttolerance/CheckpointSpec.scala | 2 +- .../engine/faulttolerance/LoggingSpec.scala | 4 +- .../engine/faulttolerance/ReplaySpec.scala | 2 +- .../ics/amber/compiler/WorkflowCompiler.scala | 8 +-- .../amber/compiler/model/LogicalLink.scala | 4 +- .../amber/compiler/model/LogicalPlan.scala | 4 +- .../WorkflowCompilationResource.scala | 4 +- .../WorkflowCompilationResourceSpec.scala | 2 +- .../amber/{ => core}/virtualidentity.proto | 2 +- .../uci/ics/amber/{ => core}/workflow.proto | 4 +- .../{ => core}/workflowruntimestate.proto | 2 +- .../amber/core/WorkflowRuntimeException.scala | 2 +- .../core/executor/OperatorExecutor.scala | 2 +- .../core/executor/SinkOperatorExecutor.scala | 2 +- .../executor/SourceOperatorExecutor.scala | 2 +- .../core/storage/result/OpResultStorage.scala | 4 +- .../core/storage/result/ResultStorage.scala | 2 +- .../storage/result/WorkflowResultStore.scala | 2 +- .../util/mongo/MongoCollectionManager.scala | 2 +- .../uci/ics/amber/core/tuple/TupleLike.scala | 2 +- .../ics/amber/core/workflow/PhysicalOp.scala | 4 +- .../amber/core/workflow/PhysicalPlan.scala | 4 +- .../amber/core/workflow/WorkflowContext.scala | 2 +- .../edu/uci/ics/amber/util/JSONUtils.scala | 2 +- .../ics/amber/util/VirtualIdentityUtils.scala | 2 +- .../serde/PortIdentityKeyDeserializer.scala | 2 +- .../serde/PortIdentityKeySerializer.scala | 2 +- .../uci/ics/amber/operator/LogicalOp.scala | 8 ++- .../operator/PythonOperatorDescriptor.scala | 2 +- .../operator/SpecialPhysicalOpFactory.scala | 13 +++-- .../operator/aggregate/AggregateOpDesc.scala | 8 ++- .../CartesianProductOpDesc.scala | 4 +- .../dictionary/DictionaryMatcherOpDesc.scala | 4 +- .../difference/DifferenceOpDesc.scala | 4 +- .../operator/distinct/DistinctOpDesc.scala | 4 +- .../amber/operator/dummy/DummyOpDesc.scala | 2 +- .../amber/operator/filter/FilterOpDesc.scala | 2 +- .../filter/SpecializedFilterOpDesc.scala | 4 +- .../operator/hashJoin/HashJoinOpDesc.scala | 8 ++- ...gingFaceIrisLogisticRegressionOpDesc.scala | 2 +- .../HuggingFaceSentimentAnalysisOpDesc.scala | 2 +- .../HuggingFaceSpamSMSDetectionOpDesc.scala | 2 +- .../HuggingFaceTextSummarizationOpDesc.scala | 2 +- .../operator/intersect/IntersectOpDesc.scala | 4 +- .../intervalJoin/IntervalJoinOpDesc.scala | 4 +- .../keywordSearch/KeywordSearchOpDesc.scala | 4 +- .../amber/operator/limit/LimitOpDesc.scala | 4 +- .../Scorer/MachineLearningScorerOpDesc.scala | 2 +- .../base/SklearnAdvancedBaseDesc.scala | 2 +- .../ics/amber/operator/map/MapOpDesc.scala | 2 +- .../metadata/OperatorMetadataGenerator.scala | 2 +- .../projection/ProjectionOpDesc.scala | 4 +- .../RandomKSamplingOpDesc.scala | 4 +- .../amber/operator/regex/RegexOpDesc.scala | 4 +- .../ReservoirSamplingOpDesc.scala | 4 +- .../sentiment/SentimentAnalysisOpDesc.scala | 4 +- .../sink/managed/ProgressiveSinkOpExec.scala | 6 +-- .../sklearn/SklearnClassifierOpDesc.scala | 2 +- .../SklearnLinearRegressionOpDesc.scala | 2 +- .../sklearn/SklearnPredictionOpDesc.scala | 2 +- .../ics/amber/operator/sort/SortOpDesc.scala | 2 +- .../sortPartitions/SortPartitionsOpDesc.scala | 4 +- .../reddit/RedditSearchSourceOpDesc.scala | 2 +- .../apis/twitter/TwitterSourceOpDesc.scala | 2 +- ...TwitterFullArchiveSearchSourceOpDesc.scala | 2 +- .../v2/TwitterSearchSourceOpDesc.scala | 2 +- .../source/cache/CacheSourceOpExec.scala | 2 +- .../source/fetcher/URLFetcherOpDesc.scala | 4 +- .../source/scan/FileScanSourceOpDesc.scala | 2 +- .../source/scan/ScanSourceOpDesc.scala | 2 +- .../source/scan/arrow/ArrowSourceOpDesc.scala | 2 +- .../source/scan/csv/CSVScanSourceOpDesc.scala | 2 +- .../csv/ParallelCSVScanSourceOpDesc.scala | 2 +- .../scan/csvOld/CSVOldScanSourceOpDesc.scala | 2 +- .../scan/json/JSONLScanSourceOpDesc.scala | 2 +- .../scan/text/TextInputSourceOpDesc.scala | 4 +- .../sql/asterixdb/AsterixDBSourceOpDesc.scala | 4 +- .../source/sql/mysql/MySQLSourceOpDesc.scala | 4 +- .../postgresql/PostgreSQLSourceOpDesc.scala | 4 +- .../amber/operator/split/SplitOpDesc.scala | 4 +- .../amber/operator/split/SplitOpExec.scala | 2 +- .../SymmetricDifferenceOpDesc.scala | 4 +- .../typecasting/TypeCastingOpDesc.scala | 4 +- .../operator/udf/java/JavaUDFOpDesc.scala | 4 +- .../DualInputPortsPythonUDFOpDescV2.scala | 4 +- .../python/PythonLambdaFunctionOpDesc.scala | 2 +- .../udf/python/PythonTableReducerOpDesc.scala | 2 +- .../udf/python/PythonUDFOpDescV2.scala | 4 +- .../source/PythonUDFSourceOpDescV2.scala | 4 +- .../ics/amber/operator/udf/r/RUDFOpDesc.scala | 4 +- .../operator/udf/r/RUDFSourceOpDesc.scala | 4 +- .../amber/operator/union/UnionOpDesc.scala | 4 +- .../unneststring/UnnestStringOpDesc.scala | 4 +- .../visualization/DotPlot/DotPlotOpDesc.scala | 4 +- .../IcicleChart/IcicleChartOpDesc.scala | 4 +- .../ImageViz/ImageVisualizerOpDesc.scala | 4 +- .../ScatterMatrixChartOpDesc.scala | 4 +- .../barChart/BarChartOpDesc.scala | 4 +- .../visualization/boxPlot/BoxPlotOpDesc.scala | 4 +- .../bubbleChart/BubbleChartOpDesc.scala | 4 +- .../CandlestickChartOpDesc.scala | 4 +- .../ContinuousErrorBandsOpDesc.scala | 4 +- .../contourPlot/ContourPlotOpDesc.scala | 4 +- .../dumbbellPlot/DumbbellPlotOpDesc.scala | 4 +- .../FigureFactoryTableOpDesc.scala | 4 +- .../filledAreaPlot/FilledAreaPlotOpDesc.scala | 4 +- .../funnelPlot/FunnelPlotOpDesc.scala | 4 +- .../ganttChart/GanttChartOpDesc.scala | 4 +- .../visualization/heatMap/HeatMapOpDesc.scala | 4 +- .../hierarchychart/HierarchyChartOpDesc.scala | 4 +- .../histogram/HistogramChartOpDesc.scala | 4 +- .../visualization/htmlviz/HtmlVizOpDesc.scala | 6 +-- .../lineChart/LineChartOpDesc.scala | 4 +- .../pieChart/PieChartOpDesc.scala | 4 +- .../quiverPlot/QuiverPlotOpDesc.scala | 4 +- .../sankeyDiagram/SankeyDiagramOpDesc.scala | 4 +- .../scatter3DChart/Scatter3dChartOpDesc.scala | 4 +- .../scatterplot/ScatterplotOpDesc.scala | 4 +- .../tablesChart/TablesPlotOpDesc.scala | 4 +- .../ternaryPlot/TernaryPlotOpDesc.scala | 4 +- .../visualization/urlviz/UrlVizOpDesc.scala | 6 +-- .../waterfallChart/WaterfallChartOpDesc.scala | 4 +- .../wordCloud/WordCloudOpDesc.scala | 4 +- .../intersect/IntersectOpExecSpec.scala | 4 +- .../intervalJoin/IntervalOpExecSpec.scala | 4 +- .../scan/csv/CSVScanSourceOpDescSpec.scala | 2 +- .../unneststring/UnnestStringOpExecSpec.scala | 2 +- 247 files changed, 424 insertions(+), 410 deletions(-) rename core/workflow-core/src/main/protobuf/edu/uci/ics/amber/{ => core}/virtualidentity.proto (95%) rename core/workflow-core/src/main/protobuf/edu/uci/ics/amber/{ => core}/workflow.proto (93%) rename core/workflow-core/src/main/protobuf/edu/uci/ics/amber/{ => core}/workflowruntimestate.proto (94%) diff --git a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/rpc/controlcommands.proto b/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/rpc/controlcommands.proto index 202c355b854..81f7f4b21ba 100644 --- a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/rpc/controlcommands.proto +++ b/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/rpc/controlcommands.proto @@ -1,8 +1,8 @@ syntax = "proto3"; package edu.uci.ics.amber.engine.architecture.rpc; -import "edu/uci/ics/amber/virtualidentity.proto"; -import "edu/uci/ics/amber/workflow.proto"; +import "edu/uci/ics/amber/core/virtualidentity.proto"; +import "edu/uci/ics/amber/core/workflow.proto"; import "edu/uci/ics/amber/engine/architecture/worker/statistics.proto"; import "edu/uci/ics/amber/engine/architecture/sendsemantics/partitionings.proto"; import "scalapb/scalapb.proto"; @@ -58,8 +58,8 @@ message EmptyRequest{} message AsyncRPCContext { option (scalapb.message).no_box = true; - ActorVirtualIdentity sender = 1 [(scalapb.field).no_box = true]; - ActorVirtualIdentity receiver = 2 [(scalapb.field).no_box = true]; + core.ActorVirtualIdentity sender = 1 [(scalapb.field).no_box = true]; + core.ActorVirtualIdentity receiver = 2 [(scalapb.field).no_box = true]; } message ControlInvocation { @@ -79,25 +79,25 @@ enum ChannelMarkerType { // Message for ChannelMarkerPayload message ChannelMarkerPayload { option (scalapb.message).extends = "edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessagePayload"; - ChannelMarkerIdentity id = 1 [(scalapb.field).no_box = true]; + core.ChannelMarkerIdentity id = 1 [(scalapb.field).no_box = true]; ChannelMarkerType markerType = 2; - repeated ChannelIdentity scope = 3; + repeated core.ChannelIdentity scope = 3; map commandMapping = 4; } message PropagateChannelMarkerRequest { - repeated PhysicalOpIdentity sourceOpToStartProp = 1; - ChannelMarkerIdentity id = 2 [(scalapb.field).no_box = true]; + repeated core.PhysicalOpIdentity sourceOpToStartProp = 1; + core.ChannelMarkerIdentity id = 2 [(scalapb.field).no_box = true]; ChannelMarkerType markerType = 3; - repeated PhysicalOpIdentity scope = 4; - repeated PhysicalOpIdentity targetOps = 5; + repeated core.PhysicalOpIdentity scope = 4; + repeated core.PhysicalOpIdentity targetOps = 5; ControlRequest markerCommand = 6; string markerMethodName = 7; } message TakeGlobalCheckpointRequest { bool estimationOnly = 1; - ChannelMarkerIdentity checkpointId = 2 [(scalapb.field).no_box = true]; + core.ChannelMarkerIdentity checkpointId = 2 [(scalapb.field).no_box = true]; string destination = 3; } @@ -122,7 +122,7 @@ message ModifyLogicRequest { } message RetryWorkflowRequest { - repeated ActorVirtualIdentity workers = 1; + repeated core.ActorVirtualIdentity workers = 1; } enum ConsoleMessageType{ @@ -147,7 +147,7 @@ message ConsoleMessageTriggeredRequest { } message PortCompletedRequest { - PortIdentity portId = 1 [(scalapb.field).no_box = true]; + core.PortIdentity portId = 1 [(scalapb.field).no_box = true]; bool input = 2; } @@ -156,21 +156,21 @@ message WorkerStateUpdatedRequest { } message LinkWorkersRequest { - PhysicalLink link = 1 [(scalapb.field).no_box = true]; + core.PhysicalLink link = 1 [(scalapb.field).no_box = true]; } // Ping message message Ping { int32 i = 1; int32 end = 2; - ActorVirtualIdentity to = 3 [(scalapb.field).no_box = true]; + core.ActorVirtualIdentity to = 3 [(scalapb.field).no_box = true]; } // Pong message message Pong { int32 i = 1; int32 end = 2; - ActorVirtualIdentity to = 3 [(scalapb.field).no_box = true]; + core.ActorVirtualIdentity to = 3 [(scalapb.field).no_box = true]; } // Pass message @@ -185,7 +185,7 @@ message Nested { // MultiCall message message MultiCall { - repeated ActorVirtualIdentity seq = 1; + repeated core.ActorVirtualIdentity seq = 1; } // ErrorCommand message @@ -194,7 +194,7 @@ message ErrorCommand { // Collect message message Collect { - repeated ActorVirtualIdentity workers = 1; + repeated core.ActorVirtualIdentity workers = 1; } // GenerateNumber message @@ -203,7 +203,7 @@ message GenerateNumber { // Chain message message Chain { - repeated ActorVirtualIdentity nexts = 1; + repeated core.ActorVirtualIdentity nexts = 1; } // Recursion message @@ -213,23 +213,23 @@ message Recursion { // Messages for the commands message AddInputChannelRequest { - ChannelIdentity channelId = 1 [(scalapb.field).no_box = true]; - PortIdentity portId = 2 [(scalapb.field).no_box = true]; + core.ChannelIdentity channelId = 1 [(scalapb.field).no_box = true]; + core.PortIdentity portId = 2 [(scalapb.field).no_box = true]; } message AddPartitioningRequest { - PhysicalLink tag = 1 [(scalapb.field).no_box = true]; + core.PhysicalLink tag = 1 [(scalapb.field).no_box = true]; sendsemantics.Partitioning partitioning = 2 [(scalapb.field).no_box = true]; } message AssignPortRequest { - PortIdentity portId = 1 [(scalapb.field).no_box = true]; + core.PortIdentity portId = 1 [(scalapb.field).no_box = true]; bool input = 2; map schema = 3; } message FinalizeCheckpointRequest { - ChannelMarkerIdentity checkpointId = 1 [(scalapb.field).no_box = true]; + core.ChannelMarkerIdentity checkpointId = 1 [(scalapb.field).no_box = true]; string writeTo = 2; } @@ -241,16 +241,16 @@ message InitializeExecutorRequest { } message UpdateExecutorRequest { - PhysicalOpIdentity targetOpId = 1 [(scalapb.field).no_box = true]; + core.PhysicalOpIdentity targetOpId = 1 [(scalapb.field).no_box = true]; google.protobuf.Any newExecutor = 2 [(scalapb.field).no_box = true]; google.protobuf.Any stateTransferFunc = 3; } message PrepareCheckpointRequest{ - ChannelMarkerIdentity checkpointId = 1 [(scalapb.field).no_box = true]; + core.ChannelMarkerIdentity checkpointId = 1 [(scalapb.field).no_box = true]; bool estimationOnly = 2; } message QueryStatisticsRequest{ - repeated ActorVirtualIdentity filterByWorkers = 1; + repeated core.ActorVirtualIdentity filterByWorkers = 1; } \ No newline at end of file diff --git a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/sendsemantics/partitionings.proto b/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/sendsemantics/partitionings.proto index 78c1cf8ab60..dfab32705b2 100644 --- a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/sendsemantics/partitionings.proto +++ b/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/sendsemantics/partitionings.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package edu.uci.ics.amber.engine.architecture.sendsemantics; +import "edu/uci/ics/amber/core/virtualidentity.proto"; import "scalapb/scalapb.proto"; option (scalapb.options) = { @@ -10,8 +11,6 @@ option (scalapb.options) = { no_default_values_in_constructor: true }; -import "edu/uci/ics/amber/virtualidentity.proto"; - message Partitioning{ oneof sealed_value{ OneToOnePartitioning oneToOnePartitioning = 1; @@ -24,23 +23,23 @@ message Partitioning{ message OneToOnePartitioning{ int32 batchSize = 1; - repeated ChannelIdentity channels = 2; + repeated core.ChannelIdentity channels = 2; } message RoundRobinPartitioning{ int32 batchSize = 1; - repeated ChannelIdentity channels = 2; + repeated core.ChannelIdentity channels = 2; } message HashBasedShufflePartitioning{ int32 batchSize = 1; - repeated ChannelIdentity channels = 2; + repeated core.ChannelIdentity channels = 2; repeated string hashAttributeNames = 3; } message RangeBasedShufflePartitioning { int32 batchSize = 1; - repeated ChannelIdentity channels = 2; + repeated core.ChannelIdentity channels = 2; repeated string rangeAttributeNames = 3; int64 rangeMin = 4; int64 rangeMax = 5; @@ -48,5 +47,5 @@ message RangeBasedShufflePartitioning { message BroadcastPartitioning{ int32 batchSize = 1; - repeated ChannelIdentity channels = 2; + repeated core.ChannelIdentity channels = 2; } diff --git a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/worker/statistics.proto b/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/worker/statistics.proto index a6b64802949..02e8dd39a32 100644 --- a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/worker/statistics.proto +++ b/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/architecture/worker/statistics.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package edu.uci.ics.amber.engine.architecture.worker; -import "edu/uci/ics/amber/workflow.proto"; +import "edu/uci/ics/amber/core/workflow.proto"; import "scalapb/scalapb.proto"; option (scalapb.options) = { @@ -22,7 +22,7 @@ enum WorkerState { } message PortTupleCountMapping { - PortIdentity port_id = 1 [(scalapb.field).no_box = true]; + core.PortIdentity port_id = 1 [(scalapb.field).no_box = true]; int64 tuple_count = 2; } diff --git a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/common/ambermessage.proto b/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/common/ambermessage.proto index e0fbdee43d3..ed22f55fd68 100644 --- a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/common/ambermessage.proto +++ b/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/common/ambermessage.proto @@ -4,7 +4,7 @@ package edu.uci.ics.amber.engine.common; import "edu/uci/ics/amber/engine/architecture/rpc/controlcommands.proto"; import "edu/uci/ics/amber/engine/architecture/rpc/controlreturns.proto"; -import "edu/uci/ics/amber/virtualidentity.proto"; +import "edu/uci/ics/amber/core/virtualidentity.proto"; import "scalapb/scalapb.proto"; option (scalapb.options) = { @@ -21,11 +21,11 @@ message ControlPayloadV2 { } message PythonDataHeader { - ActorVirtualIdentity tag = 1 [(scalapb.field).no_box = true]; + core.ActorVirtualIdentity tag = 1 [(scalapb.field).no_box = true]; string payload_type = 2; } message PythonControlMessage { - ActorVirtualIdentity tag = 1 [(scalapb.field).no_box = true]; + core.ActorVirtualIdentity tag = 1 [(scalapb.field).no_box = true]; ControlPayloadV2 payload = 2 [(scalapb.field).no_box = true]; } diff --git a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/common/executionruntimestate.proto b/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/common/executionruntimestate.proto index 7600422b4bd..f6a092477b3 100644 --- a/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/common/executionruntimestate.proto +++ b/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/common/executionruntimestate.proto @@ -5,8 +5,8 @@ package edu.uci.ics.amber.engine.common; import "edu/uci/ics/amber/engine/architecture/rpc/controlcommands.proto"; import "edu/uci/ics/amber/engine/architecture/rpc/controlreturns.proto"; import "edu/uci/ics/amber/engine/architecture/worker/statistics.proto"; -import "edu/uci/ics/amber/virtualidentity.proto"; -import "edu/uci/ics/amber/workflowruntimestate.proto"; +import "edu/uci/ics/amber/core/virtualidentity.proto"; +import "edu/uci/ics/amber/core/workflowruntimestate.proto"; import "scalapb/scalapb.proto"; option (scalapb.options) = { @@ -36,11 +36,11 @@ message ExecutionBreakpointStore{ } message EvaluatedValueList{ - repeated amber.engine.architecture.rpc.EvaluatedValue values = 1; + repeated architecture.rpc.EvaluatedValue values = 1; } message OperatorConsole{ - repeated edu.uci.ics.amber.engine.architecture.rpc.ConsoleMessage console_messages = 1; + repeated architecture.rpc.ConsoleMessage console_messages = 1; map evaluate_expr_results = 2; } @@ -54,8 +54,8 @@ message OperatorWorkerMapping{ } message OperatorStatistics{ - repeated amber.engine.architecture.worker.PortTupleCountMapping input_count = 1; - repeated amber.engine.architecture.worker.PortTupleCountMapping output_count = 2; + repeated architecture.worker.PortTupleCountMapping input_count = 1; + repeated architecture.worker.PortTupleCountMapping output_count = 2; int32 num_workers = 3; int64 data_processing_time = 4; int64 control_processing_time = 5; @@ -63,7 +63,7 @@ message OperatorStatistics{ } message OperatorMetrics{ - edu.uci.ics.amber.engine.architecture.rpc.WorkflowAggregatedState operator_state = 1 [(scalapb.field).no_box = true]; + architecture.rpc.WorkflowAggregatedState operator_state = 1 [(scalapb.field).no_box = true]; OperatorStatistics operator_statistics = 2 [(scalapb.field).no_box = true]; } @@ -76,8 +76,8 @@ message ExecutionStatsStore { message ExecutionMetadataStore{ - edu.uci.ics.amber.engine.architecture.rpc.WorkflowAggregatedState state = 1; - repeated WorkflowFatalError fatal_errors = 2; - ExecutionIdentity executionId = 3 [(scalapb.field).no_box = true]; + architecture.rpc.WorkflowAggregatedState state = 1; + repeated core.WorkflowFatalError fatal_errors = 2; + core.ExecutionIdentity executionId = 3 [(scalapb.field).no_box = true]; bool is_recovering = 4; } \ No newline at end of file diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/clustering/ClusterListener.scala b/core/amber/src/main/scala/edu/uci/ics/amber/clustering/ClusterListener.scala index 72cff807214..9c639946d3c 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/clustering/ClusterListener.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/clustering/ClusterListener.scala @@ -12,9 +12,9 @@ import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregat } import edu.uci.ics.amber.engine.common.{AmberConfig, AmberLogging} import edu.uci.ics.amber.error.ErrorUtils.getStackTraceWithAllCauses -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity -import edu.uci.ics.amber.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE -import edu.uci.ics.amber.workflowruntimestate.WorkflowFatalError +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE +import edu.uci.ics.amber.core.workflowruntimestate.WorkflowFatalError import edu.uci.ics.texera.web.SessionState import edu.uci.ics.texera.web.model.websocket.response.ClusterStatusUpdateEvent import edu.uci.ics.texera.web.service.{WorkflowExecutionService, WorkflowService} diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AkkaActorRefMappingService.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AkkaActorRefMappingService.scala index 3bf9ce4b7cb..7231695b5d0 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AkkaActorRefMappingService.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AkkaActorRefMappingService.scala @@ -10,7 +10,7 @@ import edu.uci.ics.amber.engine.architecture.common.WorkflowActor.{ import edu.uci.ics.amber.engine.common.AmberLogging import edu.uci.ics.amber.engine.common.virtualidentity.util.{CONTROLLER, SELF} import edu.uci.ics.amber.util.VirtualIdentityUtils -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AkkaActorService.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AkkaActorService.scala index 6b870e00867..3cc36a77ead 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AkkaActorService.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AkkaActorService.scala @@ -3,7 +3,7 @@ package edu.uci.ics.amber.engine.architecture.common import akka.actor.{ActorContext, ActorRef, Address, Cancellable, Props} import akka.util.Timeout import edu.uci.ics.amber.engine.common.FutureBijection._ -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity import scala.concurrent.ExecutionContext import scala.concurrent.duration.{DurationInt, FiniteDuration} diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AkkaMessageTransferService.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AkkaMessageTransferService.scala index 603d2b2e8c0..4609f309783 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AkkaMessageTransferService.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AkkaMessageTransferService.scala @@ -5,7 +5,7 @@ import edu.uci.ics.amber.engine.architecture.common.WorkflowActor.NetworkMessage import edu.uci.ics.amber.engine.architecture.messaginglayer.{CongestionControl, FlowControl} import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage import edu.uci.ics.amber.engine.common.{AmberConfig, AmberLogging} -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} import scala.collection.mutable import scala.concurrent.duration.DurationInt diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AmberProcessor.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AmberProcessor.scala index 3a967e1839e..301f5b086ad 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AmberProcessor.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/AmberProcessor.scala @@ -12,7 +12,7 @@ import edu.uci.ics.amber.engine.architecture.worker.managers.StatisticsManager import edu.uci.ics.amber.engine.common.AmberLogging import edu.uci.ics.amber.engine.common.ambermessage.{ControlPayload, WorkflowFIFOMessage} import edu.uci.ics.amber.engine.common.rpc.{AsyncRPCClient, AsyncRPCServer} -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} abstract class AmberProcessor( val actorId: ActorVirtualIdentity, diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/ProcessingStepCursor.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/ProcessingStepCursor.scala index c3a8d96f7fc..d9d32b752a7 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/ProcessingStepCursor.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/ProcessingStepCursor.scala @@ -1,7 +1,7 @@ package edu.uci.ics.amber.engine.architecture.common import edu.uci.ics.amber.engine.architecture.common.ProcessingStepCursor.INIT_STEP -import edu.uci.ics.amber.virtualidentity.ChannelIdentity +import edu.uci.ics.amber.core.virtualidentity.ChannelIdentity object ProcessingStepCursor { // step value before processing any incoming message diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/WorkflowActor.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/WorkflowActor.scala index bf988f10ee6..898ab42444e 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/WorkflowActor.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/common/WorkflowActor.scala @@ -20,7 +20,7 @@ import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.{ import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage import edu.uci.ics.amber.engine.common.{AmberLogging, CheckpointState} -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} import scala.concurrent.Await import scala.concurrent.duration.DurationInt diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ClientEvent.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ClientEvent.scala index ea4e2137a88..2439ecaba16 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ClientEvent.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ClientEvent.scala @@ -4,7 +4,7 @@ import edu.uci.ics.amber.core.tuple.Tuple import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessagePayload import edu.uci.ics.amber.engine.common.executionruntimestate.OperatorMetrics -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity trait ClientEvent extends WorkflowFIFOMessagePayload diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/Controller.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/Controller.scala index 80e58b86f6e..ca2fdb5477f 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/Controller.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/Controller.scala @@ -18,7 +18,7 @@ import edu.uci.ics.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize import edu.uci.ics.amber.engine.common.ambermessage.{ControlPayload, WorkflowFIFOMessage} import edu.uci.ics.amber.engine.common.virtualidentity.util.{CLIENT, CONTROLLER, SELF} import edu.uci.ics.amber.engine.common.{AmberConfig, CheckpointState, SerializedState} -import edu.uci.ics.amber.virtualidentity.ChannelIdentity +import edu.uci.ics.amber.core.virtualidentity.ChannelIdentity import scala.concurrent.duration.DurationInt diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerAsyncRPCHandlerInitializer.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerAsyncRPCHandlerInitializer.scala index d30439cbc5a..634e603dc5a 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerAsyncRPCHandlerInitializer.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerAsyncRPCHandlerInitializer.scala @@ -6,7 +6,7 @@ import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.AsyncRPCContext import edu.uci.ics.amber.engine.architecture.rpc.controllerservice.ControllerServiceFs2Grpc import edu.uci.ics.amber.engine.common.AmberLogging import edu.uci.ics.amber.engine.common.rpc.AsyncRPCHandlerInitializer -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity class ControllerAsyncRPCHandlerInitializer( val cp: ControllerProcessor diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerProcessor.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerProcessor.scala index 215d18eb9d2..4d2ae3461a9 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerProcessor.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerProcessor.scala @@ -12,7 +12,7 @@ import edu.uci.ics.amber.engine.architecture.logreplay.ReplayLogManager import edu.uci.ics.amber.engine.architecture.scheduling.WorkflowExecutionCoordinator import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity class ControllerProcessor( workflowContext: WorkflowContext, diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/GlobalReplayManager.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/GlobalReplayManager.scala index 83aae75afab..971151cb179 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/GlobalReplayManager.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/GlobalReplayManager.scala @@ -1,6 +1,6 @@ package edu.uci.ics.amber.engine.architecture.controller -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/WorkflowScheduler.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/WorkflowScheduler.scala index bec06fd7a93..eefe464d27e 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/WorkflowScheduler.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/WorkflowScheduler.scala @@ -8,7 +8,7 @@ import edu.uci.ics.amber.engine.architecture.scheduling.{ Schedule } import edu.uci.ics.amber.engine.common.AmberConfig -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity class WorkflowScheduler( workflowContext: WorkflowContext, diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/LinkExecution.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/LinkExecution.scala index b9e05df7a50..e5e3ce34668 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/LinkExecution.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/LinkExecution.scala @@ -1,6 +1,6 @@ package edu.uci.ics.amber.engine.architecture.controller.execution -import edu.uci.ics.amber.virtualidentity.ChannelIdentity +import edu.uci.ics.amber.core.virtualidentity.ChannelIdentity import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/OperatorExecution.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/OperatorExecution.scala index 32df811be94..74d9d7441c6 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/OperatorExecution.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/OperatorExecution.scala @@ -5,8 +5,8 @@ import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.WorkerExecuti import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState import edu.uci.ics.amber.engine.architecture.worker.statistics.{PortTupleCountMapping, WorkerState} import edu.uci.ics.amber.engine.common.executionruntimestate.{OperatorMetrics, OperatorStatistics} -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity import java.util import scala.jdk.CollectionConverters._ diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/RegionExecution.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/RegionExecution.scala index 53c28796f87..22701515f9e 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/RegionExecution.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/RegionExecution.scala @@ -5,8 +5,8 @@ import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregat import edu.uci.ics.amber.engine.architecture.scheduling.Region import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerStatistics import edu.uci.ics.amber.engine.common.executionruntimestate.OperatorMetrics -import edu.uci.ics.amber.virtualidentity.PhysicalOpIdentity -import edu.uci.ics.amber.workflow.PhysicalLink +import edu.uci.ics.amber.core.virtualidentity.PhysicalOpIdentity +import edu.uci.ics.amber.core.workflow.PhysicalLink import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/WorkflowExecution.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/WorkflowExecution.scala index cb945cd4942..0784621f8b0 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/WorkflowExecution.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/WorkflowExecution.scala @@ -5,7 +5,7 @@ import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregat import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState._ import edu.uci.ics.amber.engine.architecture.scheduling.{Region, RegionIdentity} import edu.uci.ics.amber.engine.common.executionruntimestate.OperatorMetrics -import edu.uci.ics.amber.virtualidentity.PhysicalOpIdentity +import edu.uci.ics.amber.core.virtualidentity.PhysicalOpIdentity import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/ChannelMarkerHandler.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/ChannelMarkerHandler.scala index 4f0efe392ac..a01ee8a6aa7 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/ChannelMarkerHandler.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/ChannelMarkerHandler.scala @@ -13,7 +13,7 @@ import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.{ } import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER import edu.uci.ics.amber.util.VirtualIdentityUtils -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} trait ChannelMarkerHandler { this: ControllerAsyncRPCHandlerInitializer => diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/DebugCommandHandler.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/DebugCommandHandler.scala index adeffba80ec..0be7f8faef7 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/DebugCommandHandler.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/DebugCommandHandler.scala @@ -7,7 +7,7 @@ import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{ DebugCommandRequest } import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EmptyReturn -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity trait DebugCommandHandler { this: ControllerAsyncRPCHandlerInitializer => diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/EvaluatePythonExpressionHandler.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/EvaluatePythonExpressionHandler.scala index 394b11c0d86..d7d398912a4 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/EvaluatePythonExpressionHandler.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/EvaluatePythonExpressionHandler.scala @@ -7,7 +7,7 @@ import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{ EvaluatePythonExpressionRequest } import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.EvaluatePythonExpressionResponse -import edu.uci.ics.amber.virtualidentity.OperatorIdentity +import edu.uci.ics.amber.core.virtualidentity.OperatorIdentity trait EvaluatePythonExpressionHandler { this: ControllerAsyncRPCHandlerInitializer => diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/PauseHandler.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/PauseHandler.scala index b7d64982d8e..6dd48bcd21f 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/PauseHandler.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/PauseHandler.scala @@ -9,7 +9,7 @@ import edu.uci.ics.amber.engine.architecture.controller.{ } import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{AsyncRPCContext, EmptyRequest} import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.{EmptyReturn, WorkerMetricsResponse} -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/RetrieveWorkflowStateHandler.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/RetrieveWorkflowStateHandler.scala index 0e3b5733497..766384125e9 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/RetrieveWorkflowStateHandler.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/RetrieveWorkflowStateHandler.scala @@ -14,7 +14,7 @@ import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.{ } import edu.uci.ics.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc.METHOD_RETRIEVE_STATE import edu.uci.ics.amber.engine.common.virtualidentity.util.SELF -import edu.uci.ics.amber.virtualidentity.ChannelMarkerIdentity +import edu.uci.ics.amber.core.virtualidentity.ChannelMarkerIdentity import java.time.Instant diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/TakeGlobalCheckpointHandler.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/TakeGlobalCheckpointHandler.scala index 3c7d9c7dd3c..2478f0ec89b 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/TakeGlobalCheckpointHandler.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/TakeGlobalCheckpointHandler.scala @@ -9,7 +9,7 @@ import edu.uci.ics.amber.engine.architecture.rpc.workerservice.WorkerServiceGrpc import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage import edu.uci.ics.amber.engine.common.virtualidentity.util.SELF import edu.uci.ics.amber.engine.common.{CheckpointState, SerializedState} -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity import java.net.URI diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/layer/WorkerExecution.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/layer/WorkerExecution.scala index 14ea621f56c..ab391e5adad 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/layer/WorkerExecution.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/layer/WorkerExecution.scala @@ -3,7 +3,7 @@ package edu.uci.ics.amber.engine.architecture.deploysemantics.layer import edu.uci.ics.amber.engine.architecture.controller.execution.WorkerPortExecution import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerState.UNINITIALIZED import edu.uci.ics.amber.engine.architecture.worker.statistics.{WorkerState, WorkerStatistics} -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/EmptyReplayLogger.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/EmptyReplayLogger.scala index 6864d56eb1c..47613a9c790 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/EmptyReplayLogger.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/EmptyReplayLogger.scala @@ -1,7 +1,7 @@ package edu.uci.ics.amber.engine.architecture.logreplay import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage -import edu.uci.ics.amber.virtualidentity.{ChannelIdentity, ChannelMarkerIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ChannelIdentity, ChannelMarkerIdentity} class EmptyReplayLogger extends ReplayLogger { diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/OrderEnforcer.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/OrderEnforcer.scala index dc395293df7..7ff3a01dadd 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/OrderEnforcer.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/OrderEnforcer.scala @@ -1,6 +1,6 @@ package edu.uci.ics.amber.engine.architecture.logreplay -import edu.uci.ics.amber.virtualidentity.ChannelIdentity +import edu.uci.ics.amber.core.virtualidentity.ChannelIdentity trait OrderEnforcer { var isCompleted: Boolean diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLogGenerator.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLogGenerator.scala index 7df42f20e4a..176914604b8 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLogGenerator.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLogGenerator.scala @@ -2,7 +2,7 @@ package edu.uci.ics.amber.engine.architecture.logreplay import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage -import edu.uci.ics.amber.virtualidentity.ChannelMarkerIdentity +import edu.uci.ics.amber.core.virtualidentity.ChannelMarkerIdentity import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLogManager.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLogManager.scala index a304754390a..3b9ca5dfa00 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLogManager.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLogManager.scala @@ -5,7 +5,7 @@ import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.MainThreadDel import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage.SequentialRecordWriter import edu.uci.ics.amber.engine.common.storage.{EmptyRecordStorage, SequentialRecordStorage} -import edu.uci.ics.amber.virtualidentity.{ChannelIdentity, ChannelMarkerIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ChannelIdentity, ChannelMarkerIdentity} //In-mem formats: sealed trait ReplayLogRecord diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLogger.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLogger.scala index 24858f56e45..f5faf1ae9c6 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLogger.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLogger.scala @@ -1,7 +1,7 @@ package edu.uci.ics.amber.engine.architecture.logreplay import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage -import edu.uci.ics.amber.virtualidentity.{ChannelIdentity, ChannelMarkerIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ChannelIdentity, ChannelMarkerIdentity} abstract class ReplayLogger { diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLoggerImpl.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLoggerImpl.scala index 6e7b8962a27..960a456b0af 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLoggerImpl.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayLoggerImpl.scala @@ -2,7 +2,7 @@ package edu.uci.ics.amber.engine.architecture.logreplay import edu.uci.ics.amber.engine.architecture.common.ProcessingStepCursor.INIT_STEP import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage -import edu.uci.ics.amber.virtualidentity.{ChannelIdentity, ChannelMarkerIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ChannelIdentity, ChannelMarkerIdentity} import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayOrderEnforcer.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayOrderEnforcer.scala index f62254b80d9..b48b1e20d55 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayOrderEnforcer.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/logreplay/ReplayOrderEnforcer.scala @@ -1,6 +1,6 @@ package edu.uci.ics.amber.engine.architecture.logreplay -import edu.uci.ics.amber.virtualidentity.ChannelIdentity +import edu.uci.ics.amber.core.virtualidentity.ChannelIdentity import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/AmberFIFOChannel.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/AmberFIFOChannel.scala index 2cfc64fad9b..46e0845d3cb 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/AmberFIFOChannel.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/AmberFIFOChannel.scala @@ -3,8 +3,8 @@ package edu.uci.ics.amber.engine.architecture.messaginglayer import edu.uci.ics.amber.engine.common.AmberLogging import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage import edu.uci.ics.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import edu.uci.ics.amber.core.workflow.PortIdentity import java.util.concurrent.atomic.AtomicLong import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/InputGateway.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/InputGateway.scala index c64e82864c8..6c345c861c7 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/InputGateway.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/InputGateway.scala @@ -1,7 +1,7 @@ package edu.uci.ics.amber.engine.architecture.messaginglayer import edu.uci.ics.amber.engine.architecture.logreplay.OrderEnforcer -import edu.uci.ics.amber.virtualidentity.ChannelIdentity +import edu.uci.ics.amber.core.virtualidentity.ChannelIdentity trait InputGateway { diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/InputManager.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/InputManager.scala index 8f74e129ff8..7d479d86aa7 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/InputManager.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/InputManager.scala @@ -2,8 +2,8 @@ package edu.uci.ics.amber.engine.architecture.messaginglayer import edu.uci.ics.amber.core.tuple.{Schema, Tuple} import edu.uci.ics.amber.engine.common.AmberLogging -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import edu.uci.ics.amber.core.workflow.PortIdentity import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/NetworkInputGateway.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/NetworkInputGateway.scala index 25f4de433b1..b9f4c3ac5d8 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/NetworkInputGateway.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/NetworkInputGateway.scala @@ -2,7 +2,7 @@ package edu.uci.ics.amber.engine.architecture.messaginglayer import edu.uci.ics.amber.engine.architecture.logreplay.OrderEnforcer import edu.uci.ics.amber.engine.common.AmberLogging -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/NetworkOutputGateway.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/NetworkOutputGateway.scala index de074876934..f44e3c6b29a 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/NetworkOutputGateway.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/NetworkOutputGateway.scala @@ -8,7 +8,7 @@ import edu.uci.ics.amber.engine.common.ambermessage.{ WorkflowFIFOMessagePayload } import edu.uci.ics.amber.engine.common.virtualidentity.util.SELF -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} import java.util.concurrent.atomic.AtomicLong import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/OutputManager.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/OutputManager.scala index d83eb0c1a57..e6ce0c84233 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/OutputManager.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/OutputManager.scala @@ -16,8 +16,8 @@ import edu.uci.ics.amber.engine.architecture.messaginglayer.OutputManager.{ import edu.uci.ics.amber.engine.architecture.sendsemantics.partitioners._ import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings._ import edu.uci.ics.amber.engine.common.AmberLogging -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import edu.uci.ics.amber.workflow.{PhysicalLink, PortIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import edu.uci.ics.amber.core.workflow.{PhysicalLink, PortIdentity} import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/WorkerPort.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/WorkerPort.scala index fb75c05900f..4664f7b6d1e 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/WorkerPort.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/WorkerPort.scala @@ -1,7 +1,7 @@ package edu.uci.ics.amber.engine.architecture.messaginglayer import edu.uci.ics.amber.core.tuple.Schema -import edu.uci.ics.amber.virtualidentity.ChannelIdentity +import edu.uci.ics.amber.core.virtualidentity.ChannelIdentity import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonProxyClient.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonProxyClient.scala index 6ef8f53e415..05cb7b0758a 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonProxyClient.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonProxyClient.scala @@ -21,7 +21,7 @@ import edu.uci.ics.amber.engine.common.actormessage.{ActorCommand, PythonActorMe import edu.uci.ics.amber.engine.common.ambermessage._ import edu.uci.ics.amber.engine.common.{AmberLogging, AmberRuntime} import edu.uci.ics.amber.util.ArrowUtils -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity import org.apache.arrow.flight._ import org.apache.arrow.memory.{ArrowBuf, BufferAllocator, RootAllocator} import org.apache.arrow.vector.VectorSchemaRoot diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonProxyServer.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonProxyServer.scala index 523b9442800..c2b31717463 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonProxyServer.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonProxyServer.scala @@ -12,7 +12,7 @@ import edu.uci.ics.amber.engine.common.ambermessage.ControlPayloadV2.Value.{ } import edu.uci.ics.amber.engine.common.ambermessage._ import edu.uci.ics.amber.util.ArrowUtils -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity import org.apache.arrow.flight._ import org.apache.arrow.memory.{ArrowBuf, BufferAllocator, RootAllocator} import org.apache.arrow.util.AutoCloseables diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonWorkflowWorker.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonWorkflowWorker.scala index fcdfc0048b0..507f708afe7 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonWorkflowWorker.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonWorkflowWorker.scala @@ -15,7 +15,7 @@ import edu.uci.ics.amber.engine.common.actormessage.{Backpressure, CreditUpdate} import edu.uci.ics.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize import edu.uci.ics.amber.engine.common.ambermessage._ import edu.uci.ics.amber.engine.common.{CheckpointState, Utils} -import edu.uci.ics.amber.virtualidentity.ChannelIdentity +import edu.uci.ics.amber.core.virtualidentity.ChannelIdentity import java.nio.file.Path import java.util.concurrent.{ExecutorService, Executors} diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/WorkerBatchInternalQueue.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/WorkerBatchInternalQueue.scala index 984cbf15262..485cf94c72b 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/WorkerBatchInternalQueue.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/WorkerBatchInternalQueue.scala @@ -3,7 +3,7 @@ package edu.uci.ics.amber.engine.architecture.pythonworker import edu.uci.ics.amber.engine.architecture.pythonworker.WorkerBatchInternalQueue._ import edu.uci.ics.amber.engine.common.actormessage.ActorCommand import edu.uci.ics.amber.engine.common.ambermessage.{ControlPayload, DataFrame, DataPayload} -import edu.uci.ics.amber.virtualidentity.ChannelIdentity +import edu.uci.ics.amber.core.virtualidentity.ChannelIdentity import lbmq.LinkedBlockingMultiQueue import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/CostBasedScheduleGenerator.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/CostBasedScheduleGenerator.scala index ca2c5553633..457bd15e6ab 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/CostBasedScheduleGenerator.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/CostBasedScheduleGenerator.scala @@ -2,8 +2,8 @@ package edu.uci.ics.amber.engine.architecture.scheduling import edu.uci.ics.amber.core.workflow.{PhysicalPlan, WorkflowContext} import edu.uci.ics.amber.engine.common.{AmberConfig, AmberLogging} -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, PhysicalOpIdentity} -import edu.uci.ics.amber.workflow.PhysicalLink +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, PhysicalOpIdentity} +import edu.uci.ics.amber.core.workflow.PhysicalLink import org.jgrapht.alg.connectivity.BiconnectivityInspector import org.jgrapht.graph.{DirectedAcyclicGraph, DirectedPseudograph} diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGenerator.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGenerator.scala index 12206488b55..2457d09b4cd 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGenerator.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGenerator.scala @@ -3,8 +3,8 @@ package edu.uci.ics.amber.engine.architecture.scheduling import com.typesafe.scalalogging.LazyLogging import edu.uci.ics.amber.core.WorkflowRuntimeException import edu.uci.ics.amber.core.workflow.{PhysicalPlan, WorkflowContext} -import edu.uci.ics.amber.virtualidentity.PhysicalOpIdentity -import edu.uci.ics.amber.workflow.PhysicalLink +import edu.uci.ics.amber.core.virtualidentity.PhysicalOpIdentity +import edu.uci.ics.amber.core.workflow.PhysicalLink import org.jgrapht.alg.connectivity.BiconnectivityInspector import org.jgrapht.graph.DirectedAcyclicGraph diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/Region.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/Region.scala index aae121e6fcc..f90bae23cc2 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/Region.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/Region.scala @@ -2,8 +2,8 @@ package edu.uci.ics.amber.engine.architecture.scheduling import edu.uci.ics.amber.core.workflow.PhysicalOp import edu.uci.ics.amber.engine.architecture.scheduling.config.ResourceConfig -import edu.uci.ics.amber.virtualidentity.PhysicalOpIdentity -import edu.uci.ics.amber.workflow.{PhysicalLink, PortIdentity} +import edu.uci.ics.amber.core.virtualidentity.PhysicalOpIdentity +import edu.uci.ics.amber.core.workflow.{PhysicalLink, PortIdentity} import org.jgrapht.graph.{DefaultEdge, DirectedAcyclicGraph} import org.jgrapht.traverse.TopologicalOrderIterator diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/RegionExecutionCoordinator.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/RegionExecutionCoordinator.scala index 283c3b843bf..8567e0f17bb 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/RegionExecutionCoordinator.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/RegionExecutionCoordinator.scala @@ -28,7 +28,7 @@ import edu.uci.ics.amber.engine.architecture.scheduling.config.{OperatorConfig, import edu.uci.ics.amber.engine.common.AmberRuntime import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER -import edu.uci.ics.amber.workflow.PhysicalLink +import edu.uci.ics.amber.core.workflow.PhysicalLink class RegionExecutionCoordinator( region: Region, diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/RegionPlan.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/RegionPlan.scala index fd7c5717045..331bad87884 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/RegionPlan.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/RegionPlan.scala @@ -1,6 +1,6 @@ package edu.uci.ics.amber.engine.architecture.scheduling -import edu.uci.ics.amber.workflow.PhysicalLink +import edu.uci.ics.amber.core.workflow.PhysicalLink import org.jgrapht.graph.DirectedAcyclicGraph import org.jgrapht.traverse.TopologicalOrderIterator diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/ScheduleGenerator.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/ScheduleGenerator.scala index 5728f197dbc..cc4a84e1a24 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/ScheduleGenerator.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/ScheduleGenerator.scala @@ -8,8 +8,8 @@ import edu.uci.ics.amber.engine.architecture.scheduling.resourcePolicies.{ ExecutionClusterInfo } import edu.uci.ics.amber.operator.SpecialPhysicalOpFactory -import edu.uci.ics.amber.virtualidentity.PhysicalOpIdentity -import edu.uci.ics.amber.workflow.PhysicalLink +import edu.uci.ics.amber.core.virtualidentity.PhysicalOpIdentity +import edu.uci.ics.amber.core.workflow.PhysicalLink import org.jgrapht.graph.DirectedAcyclicGraph import org.jgrapht.traverse.TopologicalOrderIterator diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/WorkflowExecutionCoordinator.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/WorkflowExecutionCoordinator.scala index 937b7c5f764..e1bcb2289e9 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/WorkflowExecutionCoordinator.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/WorkflowExecutionCoordinator.scala @@ -6,7 +6,7 @@ import edu.uci.ics.amber.engine.architecture.common.AkkaActorService import edu.uci.ics.amber.engine.architecture.controller.ControllerConfig import edu.uci.ics.amber.engine.architecture.controller.execution.WorkflowExecution import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient -import edu.uci.ics.amber.workflow.PhysicalLink +import edu.uci.ics.amber.core.workflow.PhysicalLink import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/ChannelConfig.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/ChannelConfig.scala index 73944014928..3e5ef3d2d01 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/ChannelConfig.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/ChannelConfig.scala @@ -9,8 +9,8 @@ import edu.uci.ics.amber.core.workflow.{ SinglePartition, UnknownPartition } -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import edu.uci.ics.amber.core.workflow.PortIdentity case object ChannelConfig { def generateChannelConfigs( diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/LinkConfig.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/LinkConfig.scala index d31f9045949..a34e7d7e5a1 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/LinkConfig.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/LinkConfig.scala @@ -10,7 +10,7 @@ import edu.uci.ics.amber.core.workflow.{ UnknownPartition } import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings._ -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} case object LinkConfig { def toPartitioning( diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/ResourceConfig.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/ResourceConfig.scala index 311c35308ac..fd91ccac385 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/ResourceConfig.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/ResourceConfig.scala @@ -1,7 +1,7 @@ package edu.uci.ics.amber.engine.architecture.scheduling.config -import edu.uci.ics.amber.virtualidentity.PhysicalOpIdentity -import edu.uci.ics.amber.workflow.PhysicalLink +import edu.uci.ics.amber.core.virtualidentity.PhysicalOpIdentity +import edu.uci.ics.amber.core.workflow.PhysicalLink case class ResourceConfig( operatorConfigs: Map[PhysicalOpIdentity, OperatorConfig], diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/WorkerConfig.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/WorkerConfig.scala index bc0a9457bf9..84868acc335 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/WorkerConfig.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/config/WorkerConfig.scala @@ -3,7 +3,7 @@ package edu.uci.ics.amber.engine.architecture.scheduling.config import edu.uci.ics.amber.core.workflow.PhysicalOp import edu.uci.ics.amber.engine.common.AmberConfig import edu.uci.ics.amber.util.VirtualIdentityUtils -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity case object WorkerConfig { def generateWorkerConfigs(physicalOp: PhysicalOp): List[WorkerConfig] = { diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/resourcePolicies/ResourceAllocator.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/resourcePolicies/ResourceAllocator.scala index f44b04577ac..255d4177760 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/resourcePolicies/ResourceAllocator.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/resourcePolicies/ResourceAllocator.scala @@ -10,8 +10,8 @@ import edu.uci.ics.amber.engine.architecture.scheduling.config.{ OperatorConfig, ResourceConfig } -import edu.uci.ics.amber.virtualidentity.PhysicalOpIdentity -import edu.uci.ics.amber.workflow.{PhysicalLink, PortIdentity} +import edu.uci.ics.amber.core.virtualidentity.PhysicalOpIdentity +import edu.uci.ics.amber.core.workflow.{PhysicalLink, PortIdentity} import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/BroadcastPartitioner.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/BroadcastPartitioner.scala index 724007d8e16..84227f829d8 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/BroadcastPartitioner.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/BroadcastPartitioner.scala @@ -2,7 +2,7 @@ package edu.uci.ics.amber.engine.architecture.sendsemantics.partitioners import edu.uci.ics.amber.core.tuple.Tuple import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.BroadcastPartitioning -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity case class BroadcastPartitioner(partitioning: BroadcastPartitioning) extends Partitioner { diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/HashBasedShufflePartitioner.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/HashBasedShufflePartitioner.scala index 80f79a4e6e7..355c8a51853 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/HashBasedShufflePartitioner.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/HashBasedShufflePartitioner.scala @@ -2,7 +2,7 @@ package edu.uci.ics.amber.engine.architecture.sendsemantics.partitioners import edu.uci.ics.amber.core.tuple.Tuple import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.HashBasedShufflePartitioning -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity case class HashBasedShufflePartitioner(partitioning: HashBasedShufflePartitioning) extends Partitioner { diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/OneToOnePartitioner.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/OneToOnePartitioner.scala index 4c1df816d66..e4e9f24e749 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/OneToOnePartitioner.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/OneToOnePartitioner.scala @@ -2,7 +2,7 @@ package edu.uci.ics.amber.engine.architecture.sendsemantics.partitioners import edu.uci.ics.amber.core.tuple.Tuple import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity case class OneToOnePartitioner(partitioning: OneToOnePartitioning, actorId: ActorVirtualIdentity) extends Partitioner { diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/Partitioner.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/Partitioner.scala index ba447481878..ab3c0149a92 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/Partitioner.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/Partitioner.scala @@ -5,7 +5,7 @@ import edu.uci.ics.amber.core.tuple.Tuple import edu.uci.ics.amber.engine.architecture.messaginglayer.NetworkOutputGateway import edu.uci.ics.amber.engine.common.AmberConfig import edu.uci.ics.amber.engine.common.ambermessage.{DataFrame, MarkerFrame} -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity import scala.collection.mutable.ArrayBuffer diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/RangeBasedShufflePartitioner.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/RangeBasedShufflePartitioner.scala index cb78202723c..6f549287c7b 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/RangeBasedShufflePartitioner.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/RangeBasedShufflePartitioner.scala @@ -2,7 +2,7 @@ package edu.uci.ics.amber.engine.architecture.sendsemantics.partitioners import edu.uci.ics.amber.core.tuple.{AttributeType, Tuple} import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.RangeBasedShufflePartitioning -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity case class RangeBasedShufflePartitioner(partitioning: RangeBasedShufflePartitioning) extends Partitioner { diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/RoundRobinPartitioner.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/RoundRobinPartitioner.scala index 1918ea6ea0b..c4125f6ce04 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/RoundRobinPartitioner.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/sendsemantics/partitioners/RoundRobinPartitioner.scala @@ -2,7 +2,7 @@ package edu.uci.ics.amber.engine.architecture.sendsemantics.partitioners import edu.uci.ics.amber.core.tuple.Tuple import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.RoundRobinPartitioning -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity case class RoundRobinPartitioner(partitioning: RoundRobinPartitioning) extends Partitioner { private var roundRobinIndex = 0 diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/ChannelMarkerManager.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/ChannelMarkerManager.scala index 5220eaa15e9..5aabc90c466 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/ChannelMarkerManager.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/ChannelMarkerManager.scala @@ -7,7 +7,7 @@ import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.ChannelMarkerTy REQUIRE_ALIGNMENT } import edu.uci.ics.amber.engine.common.{AmberLogging, CheckpointState} -import edu.uci.ics.amber.virtualidentity.{ +import edu.uci.ics.amber.core.virtualidentity.{ ActorVirtualIdentity, ChannelIdentity, ChannelMarkerIdentity diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/DPThread.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/DPThread.scala index 2bdda981f67..5c330438405 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/DPThread.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/DPThread.scala @@ -16,7 +16,7 @@ import edu.uci.ics.amber.engine.common.ambermessage.{ } import edu.uci.ics.amber.engine.common.virtualidentity.util.SELF import edu.uci.ics.amber.error.ErrorUtils.safely -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} import java.util.concurrent._ diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/DataProcessor.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/DataProcessor.scala index 420c9cefffc..f9f3621bbe8 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/DataProcessor.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/DataProcessor.scala @@ -31,8 +31,8 @@ import edu.uci.ics.amber.engine.common.ambermessage._ import edu.uci.ics.amber.engine.common.statetransition.WorkerStateManager import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER import edu.uci.ics.amber.error.ErrorUtils.{mkConsoleMessage, safely} -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import edu.uci.ics.amber.core.workflow.PortIdentity class DataProcessor( actorId: ActorVirtualIdentity, diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/DataProcessorRPCHandlerInitializer.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/DataProcessorRPCHandlerInitializer.scala index a0df688852f..c96a9b24323 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/DataProcessorRPCHandlerInitializer.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/DataProcessorRPCHandlerInitializer.scala @@ -12,7 +12,7 @@ import edu.uci.ics.amber.engine.architecture.rpc.workerservice.WorkerServiceFs2G import edu.uci.ics.amber.engine.architecture.worker.promisehandlers._ import edu.uci.ics.amber.engine.common.AmberLogging import edu.uci.ics.amber.engine.common.rpc.AsyncRPCHandlerInitializer -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity class DataProcessorRPCHandlerInitializer(val dp: DataProcessor) extends AsyncRPCHandlerInitializer(dp.asyncRPCClient, dp.asyncRPCServer) diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/PauseManager.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/PauseManager.scala index bdaf5b7f800..078aeebd696 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/PauseManager.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/PauseManager.scala @@ -2,7 +2,7 @@ package edu.uci.ics.amber.engine.architecture.worker import edu.uci.ics.amber.engine.architecture.messaginglayer.InputGateway import edu.uci.ics.amber.engine.common.AmberLogging -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/PauseType.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/PauseType.scala index 063646941c8..8106c8a9e7b 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/PauseType.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/PauseType.scala @@ -1,6 +1,6 @@ package edu.uci.ics.amber.engine.architecture.worker -import edu.uci.ics.amber.virtualidentity.ChannelMarkerIdentity +import edu.uci.ics.amber.core.virtualidentity.ChannelMarkerIdentity sealed trait PauseType diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/WorkflowWorker.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/WorkflowWorker.scala index 5df91c4f138..4aeaed555ce 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/WorkflowWorker.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/WorkflowWorker.scala @@ -12,7 +12,7 @@ import edu.uci.ics.amber.engine.common.actormessage.{ActorCommand, Backpressure} import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage import edu.uci.ics.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize import edu.uci.ics.amber.engine.common.{CheckpointState, SerializedState} -import edu.uci.ics.amber.virtualidentity.{ChannelIdentity, ChannelMarkerIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ChannelIdentity, ChannelMarkerIdentity} import java.net.URI import java.util.concurrent.LinkedBlockingQueue diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/managers/SerializationManager.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/managers/SerializationManager.scala index ae9ebb2393b..a6ea4f74e4b 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/managers/SerializationManager.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/managers/SerializationManager.scala @@ -11,8 +11,8 @@ import edu.uci.ics.amber.engine.common.{ CheckpointSupport } import edu.uci.ics.amber.util.VirtualIdentityUtils -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity class SerializationManager(val actorId: ActorVirtualIdentity) extends AmberLogging { diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/managers/StatisticsManager.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/managers/StatisticsManager.scala index 5be4702372c..fa0d437977b 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/managers/StatisticsManager.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/managers/StatisticsManager.scala @@ -5,7 +5,7 @@ import edu.uci.ics.amber.engine.architecture.worker.statistics.{ PortTupleCountMapping, WorkerStatistics } -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/PrepareCheckpointHandler.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/PrepareCheckpointHandler.scala index 1b9fa274f20..6c00bcbd43f 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/PrepareCheckpointHandler.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/PrepareCheckpointHandler.scala @@ -13,7 +13,7 @@ import edu.uci.ics.amber.engine.architecture.worker.{ } import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage import edu.uci.ics.amber.engine.common.{CheckpointState, CheckpointSupport, SerializedState} -import edu.uci.ics.amber.virtualidentity.ChannelMarkerIdentity +import edu.uci.ics.amber.core.virtualidentity.ChannelMarkerIdentity import java.util.concurrent.CompletableFuture import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/StartHandler.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/StartHandler.scala index 066271c3509..316f70cba0a 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/StartHandler.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/StartHandler.scala @@ -10,8 +10,8 @@ import edu.uci.ics.amber.engine.architecture.worker.DataProcessorRPCHandlerIniti import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerState.{READY, RUNNING} import edu.uci.ics.amber.engine.common.ambermessage.MarkerFrame import edu.uci.ics.amber.engine.common.virtualidentity.util.SOURCE_STARTER_ACTOR -import edu.uci.ics.amber.virtualidentity.ChannelIdentity -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.virtualidentity.ChannelIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity trait StartHandler { this: DataProcessorRPCHandlerInitializer => diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/AmberLogging.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/AmberLogging.scala index d437c5e3217..3844cf59350 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/AmberLogging.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/AmberLogging.scala @@ -2,7 +2,7 @@ package edu.uci.ics.amber.engine.common import com.typesafe.scalalogging.Logger import edu.uci.ics.amber.util.VirtualIdentityUtils -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity import org.slf4j.LoggerFactory trait AmberLogging { diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/CheckpointSupport.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/CheckpointSupport.scala index f4e5fabdffa..aab7c9daf7b 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/CheckpointSupport.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/CheckpointSupport.scala @@ -1,7 +1,7 @@ package edu.uci.ics.amber.engine.common import edu.uci.ics.amber.core.tuple.TupleLike -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity trait CheckpointSupport { def serializeState( diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/RecoveryPayload.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/RecoveryPayload.scala index f23c49ae9a1..f883d772bf6 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/RecoveryPayload.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/RecoveryPayload.scala @@ -1,7 +1,7 @@ package edu.uci.ics.amber.engine.common.ambermessage import akka.actor.{ActorRef, Address} -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity sealed trait RecoveryPayload extends Serializable {} diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/WorkflowMessage.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/WorkflowMessage.scala index 1b52484130b..5a8b68687b2 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/WorkflowMessage.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/WorkflowMessage.scala @@ -1,6 +1,6 @@ package edu.uci.ics.amber.engine.common.ambermessage -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} case object WorkflowMessage { def getInMemSize(msg: WorkflowMessage): Long = { diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/client/ClientActor.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/client/ClientActor.scala index 266d9a94b42..83b9914465f 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/client/ClientActor.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/client/ClientActor.scala @@ -34,7 +34,7 @@ import edu.uci.ics.amber.engine.common.client.ClientActor.{ import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient import edu.uci.ics.amber.engine.common.virtualidentity.util.{CLIENT, CONTROLLER} import edu.uci.ics.amber.error.ErrorUtils.reconstructThrowable -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/rpc/AsyncRPCClient.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/rpc/AsyncRPCClient.scala index a66f638d238..b7f8454e317 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/rpc/AsyncRPCClient.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/rpc/AsyncRPCClient.scala @@ -16,7 +16,7 @@ import edu.uci.ics.amber.engine.common.AmberLogging import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.createProxy import edu.uci.ics.amber.engine.common.virtualidentity.util.CLIENT import edu.uci.ics.amber.error.ErrorUtils.reconstructThrowable -import edu.uci.ics.amber.virtualidentity.{ +import edu.uci.ics.amber.core.virtualidentity.{ ActorVirtualIdentity, ChannelIdentity, ChannelMarkerIdentity diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/rpc/AsyncRPCHandlerInitializer.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/rpc/AsyncRPCHandlerInitializer.scala index 2af64655404..4205027fda4 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/rpc/AsyncRPCHandlerInitializer.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/rpc/AsyncRPCHandlerInitializer.scala @@ -6,7 +6,7 @@ import edu.uci.ics.amber.engine.architecture.rpc.controlcommands._ import edu.uci.ics.amber.engine.architecture.rpc.controllerservice.ControllerServiceFs2Grpc import edu.uci.ics.amber.engine.architecture.rpc.controlreturns._ import edu.uci.ics.amber.engine.architecture.rpc.workerservice.WorkerServiceFs2Grpc -import edu.uci.ics.amber.virtualidentity.{ +import edu.uci.ics.amber.core.virtualidentity.{ ActorVirtualIdentity, ChannelIdentity, ChannelMarkerIdentity diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/rpc/AsyncRPCServer.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/rpc/AsyncRPCServer.scala index dfdc056ccbd..eae8f455049 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/rpc/AsyncRPCServer.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/rpc/AsyncRPCServer.scala @@ -10,7 +10,7 @@ import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{ import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.{ControlReturn, ReturnInvocation} import edu.uci.ics.amber.engine.common.AmberLogging import edu.uci.ics.amber.error.ErrorUtils.mkControlError -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity import java.lang.reflect.Method import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/statetransition/StateManager.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/statetransition/StateManager.scala index db54fff11ff..d346497ec39 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/statetransition/StateManager.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/statetransition/StateManager.scala @@ -5,7 +5,7 @@ import edu.uci.ics.amber.engine.common.statetransition.StateManager.{ InvalidStateException, InvalidTransitionException } -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity object StateManager { diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/statetransition/WorkerStateManager.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/statetransition/WorkerStateManager.scala index 50383e6e618..199925d91ef 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/statetransition/WorkerStateManager.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/statetransition/WorkerStateManager.scala @@ -2,7 +2,7 @@ package edu.uci.ics.amber.engine.common.statetransition import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerState import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerState._ -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity // The following pattern is a good practice of enum in scala // We've always used this pattern in the codebase diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/virtualidentity/util.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/virtualidentity/util.scala index 2ccdf56bb85..39a2ea407f4 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/virtualidentity/util.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/virtualidentity/util.scala @@ -1,6 +1,6 @@ package edu.uci.ics.amber.engine.common.virtualidentity -import edu.uci.ics.amber.virtualidentity.{ +import edu.uci.ics.amber.core.virtualidentity.{ ActorVirtualIdentity, OperatorIdentity, PhysicalOpIdentity diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/error/ErrorUtils.scala b/core/amber/src/main/scala/edu/uci/ics/amber/error/ErrorUtils.scala index b359fe15910..c1569587fbb 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/error/ErrorUtils.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/error/ErrorUtils.scala @@ -5,7 +5,7 @@ import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.ConsoleMessage import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.ConsoleMessageType.ERROR import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.{ControlError, ErrorLanguage} import edu.uci.ics.amber.util.VirtualIdentityUtils -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity import java.time.Instant import scala.util.control.ControlThrowable diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/ComputingUnitMaster.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/ComputingUnitMaster.scala index eba2c81df24..f641440c643 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/ComputingUnitMaster.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/ComputingUnitMaster.scala @@ -15,7 +15,7 @@ import edu.uci.ics.amber.engine.common.Utils.{maptoStatusCode, objectMapper} import edu.uci.ics.amber.engine.common.client.AmberClient import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage import edu.uci.ics.amber.engine.common.{AmberConfig, AmberRuntime, Utils} -import edu.uci.ics.amber.virtualidentity.ExecutionIdentity +import edu.uci.ics.amber.core.virtualidentity.ExecutionIdentity import edu.uci.ics.texera.web.auth.JwtAuth.setupJwtAuth import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.WorkflowExecutions import edu.uci.ics.texera.web.resource.WorkflowWebsocketResource diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/WorkflowErrorEvent.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/WorkflowErrorEvent.scala index a89dbc98567..bede408b24f 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/WorkflowErrorEvent.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/event/WorkflowErrorEvent.scala @@ -1,6 +1,6 @@ package edu.uci.ics.texera.web.model.websocket.event -import edu.uci.ics.amber.workflowruntimestate.WorkflowFatalError +import edu.uci.ics.amber.core.workflowruntimestate.WorkflowFatalError case class WorkflowErrorEvent( fatalErrors: Seq[WorkflowFatalError] 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 a14843596be..badece30c22 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 @@ -5,9 +5,9 @@ import com.typesafe.scalalogging.LazyLogging import edu.uci.ics.amber.clustering.ClusterListener import edu.uci.ics.amber.engine.common.Utils.objectMapper import edu.uci.ics.amber.error.ErrorUtils.getStackTraceWithAllCauses -import edu.uci.ics.amber.virtualidentity.WorkflowIdentity -import edu.uci.ics.amber.workflowruntimestate.FatalErrorType.COMPILATION_ERROR -import edu.uci.ics.amber.workflowruntimestate.WorkflowFatalError +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.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._ 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 8758fab0b85..132e9bdd7b3 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 @@ -3,7 +3,7 @@ package edu.uci.ics.texera.web.resource.dashboard.user.workflow import edu.uci.ics.amber.core.storage.StorageConfig import edu.uci.ics.amber.engine.architecture.logreplay.{ReplayDestination, ReplayLogRecord} import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage -import edu.uci.ics.amber.virtualidentity.{ChannelMarkerIdentity, ExecutionIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ChannelMarkerIdentity, ExecutionIdentity} import edu.uci.ics.texera.dao.SqlServer import edu.uci.ics.texera.web.auth.SessionUser import edu.uci.ics.texera.dao.jooq.generated.Tables.{ diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionConsoleService.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionConsoleService.scala index 3013f0bd19a..19fb357a73a 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionConsoleService.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionConsoleService.scala @@ -16,7 +16,7 @@ import edu.uci.ics.amber.engine.common.executionruntimestate.{ OperatorConsole } import edu.uci.ics.amber.util.VirtualIdentityUtils -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity import edu.uci.ics.texera.web.model.websocket.event.TexeraWebSocketEvent import edu.uci.ics.texera.web.model.websocket.event.python.ConsoleUpdateEvent import edu.uci.ics.texera.web.model.websocket.request.RetryRequest diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionResultService.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionResultService.scala index 70a21bba475..11c0002a311 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionResultService.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionResultService.scala @@ -19,9 +19,9 @@ import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregat import edu.uci.ics.amber.engine.common.client.AmberClient import edu.uci.ics.amber.engine.common.executionruntimestate.ExecutionMetadataStore import edu.uci.ics.amber.engine.common.{AmberConfig, AmberRuntime} -import edu.uci.ics.amber.virtualidentity.{OperatorIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.virtualidentity.{OperatorIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.PortIdentity import edu.uci.ics.texera.web.SubscriptionManager import edu.uci.ics.texera.web.model.websocket.event.{ PaginatedResultEvent, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionRuntimeService.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionRuntimeService.scala index 74fba31a03e..db7fa09b75f 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionRuntimeService.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionRuntimeService.scala @@ -9,7 +9,7 @@ import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{ import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregatedState._ import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.FaultToleranceConfig import edu.uci.ics.amber.engine.common.client.AmberClient -import edu.uci.ics.amber.virtualidentity.ChannelMarkerIdentity +import edu.uci.ics.amber.core.virtualidentity.ChannelMarkerIdentity import edu.uci.ics.texera.web.model.websocket.request._ import edu.uci.ics.texera.web.storage.ExecutionStateStore import edu.uci.ics.texera.web.storage.ExecutionStateStore.updateWorkflowState diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionStatsService.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionStatsService.scala index 38a1098c58e..a333d16d060 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionStatsService.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionStatsService.scala @@ -21,8 +21,8 @@ import edu.uci.ics.amber.engine.common.executionruntimestate.{ } import edu.uci.ics.amber.engine.common.{AmberConfig, Utils} import edu.uci.ics.amber.error.ErrorUtils.{getOperatorFromActorIdOpt, getStackTraceWithAllCauses} -import edu.uci.ics.amber.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE -import edu.uci.ics.amber.workflowruntimestate.WorkflowFatalError +import edu.uci.ics.amber.core.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE +import edu.uci.ics.amber.core.workflowruntimestate.WorkflowFatalError import edu.uci.ics.texera.web.SubscriptionManager import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.WorkflowRuntimeStatistics import edu.uci.ics.texera.web.model.websocket.event.{ diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionsMetadataPersistService.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionsMetadataPersistService.scala index d8b259acdaa..0016b89a480 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionsMetadataPersistService.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/service/ExecutionsMetadataPersistService.scala @@ -4,7 +4,7 @@ import com.typesafe.scalalogging.LazyLogging import edu.uci.ics.amber.core.storage.StorageConfig import edu.uci.ics.amber.core.workflow.WorkflowContext.DEFAULT_EXECUTION_ID import edu.uci.ics.amber.engine.common.AmberConfig -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.dao.SqlServer import edu.uci.ics.texera.dao.jooq.generated.tables.daos.WorkflowExecutionsDao import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.WorkflowExecutions diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/FriesReconfigurationAlgorithm.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/service/FriesReconfigurationAlgorithm.scala index 12b7c27a53b..85113b3a5ad 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/FriesReconfigurationAlgorithm.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/service/FriesReconfigurationAlgorithm.scala @@ -6,7 +6,7 @@ import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.{ PropagateChannelMarkerRequest } import edu.uci.ics.amber.engine.architecture.scheduling.{Region, WorkflowExecutionCoordinator} -import edu.uci.ics.amber.virtualidentity.PhysicalOpIdentity +import edu.uci.ics.amber.core.virtualidentity.PhysicalOpIdentity import org.jgrapht.alg.connectivity.ConnectivityInspector import scala.collection.mutable 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 83e3d89f347..7d112f30afc 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 @@ -12,7 +12,7 @@ import edu.uci.ics.amber.core.storage.result.{OpResultStorage, ResultStorage} import edu.uci.ics.amber.core.tuple.Tuple import edu.uci.ics.amber.engine.common.Utils.retry import edu.uci.ics.amber.util.PathUtils -import edu.uci.ics.amber.virtualidentity.{OperatorIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.virtualidentity.{OperatorIdentity, WorkflowIdentity} import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.User import edu.uci.ics.texera.web.model.websocket.request.ResultExportRequest import edu.uci.ics.texera.web.model.websocket.response.ResultExportResponse @@ -24,7 +24,7 @@ import edu.uci.ics.texera.web.resource.dashboard.user.dataset.DatasetResource.{ import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowVersionResource import org.jooq.types.UInteger import edu.uci.ics.amber.util.ArrowUtils -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity import java.io.{PipedInputStream, PipedOutputStream} import java.nio.charset.StandardCharsets diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowService.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowService.scala index 6f0b7868e54..9610e00c3a4 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowService.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowService.scala @@ -16,13 +16,13 @@ import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.{ } import edu.uci.ics.amber.engine.common.AmberConfig import edu.uci.ics.amber.error.ErrorUtils.{getOperatorFromActorIdOpt, getStackTraceWithAllCauses} -import edu.uci.ics.amber.virtualidentity.{ +import edu.uci.ics.amber.core.virtualidentity.{ ChannelMarkerIdentity, ExecutionIdentity, WorkflowIdentity } -import edu.uci.ics.amber.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE -import edu.uci.ics.amber.workflowruntimestate.WorkflowFatalError +import edu.uci.ics.amber.core.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE +import edu.uci.ics.amber.core.workflowruntimestate.WorkflowFatalError import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.User import edu.uci.ics.texera.web.model.websocket.event.TexeraWebSocketEvent import edu.uci.ics.texera.web.model.websocket.request.WorkflowExecuteRequest diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/ExecutionReconfigurationStore.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/ExecutionReconfigurationStore.scala index aa192f98141..ea5d44c722f 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/ExecutionReconfigurationStore.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/ExecutionReconfigurationStore.scala @@ -2,7 +2,7 @@ package edu.uci.ics.texera.web.storage import edu.uci.ics.amber.core.workflow.PhysicalOp import edu.uci.ics.amber.operator.StateTransferFunc -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity case class ExecutionReconfigurationStore( currentReconfigId: Option[String] = None, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/LogicalLink.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/LogicalLink.scala index 7e4959d972e..d9123ece957 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/LogicalLink.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/LogicalLink.scala @@ -1,8 +1,8 @@ package edu.uci.ics.texera.workflow import com.fasterxml.jackson.annotation.{JsonCreator, JsonProperty} -import edu.uci.ics.amber.virtualidentity.OperatorIdentity -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.virtualidentity.OperatorIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity case class LogicalLink( @JsonProperty("fromOpId") fromOpId: OperatorIdentity, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/LogicalPlan.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/LogicalPlan.scala index f9475fd6bb9..a76b4b589af 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/LogicalPlan.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/LogicalPlan.scala @@ -4,7 +4,7 @@ import com.typesafe.scalalogging.LazyLogging import edu.uci.ics.amber.core.storage.FileResolver import edu.uci.ics.amber.operator.LogicalOp import edu.uci.ics.amber.operator.source.scan.ScanSourceOpDesc -import edu.uci.ics.amber.virtualidentity.OperatorIdentity +import edu.uci.ics.amber.core.virtualidentity.OperatorIdentity import edu.uci.ics.texera.web.model.websocket.request.LogicalPlanPojo import org.jgrapht.graph.DirectedAcyclicGraph import org.jgrapht.util.SupplierUtil diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/WorkflowCompiler.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/WorkflowCompiler.scala index 795939f1ea0..6c13eadbffe 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/WorkflowCompiler.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/WorkflowCompiler.scala @@ -6,9 +6,9 @@ import edu.uci.ics.amber.core.workflow.{PhysicalPlan, WorkflowContext} import edu.uci.ics.amber.engine.architecture.controller.Workflow import edu.uci.ics.amber.engine.common.Utils.objectMapper import edu.uci.ics.amber.operator.SpecialPhysicalOpFactory -import edu.uci.ics.amber.virtualidentity.OperatorIdentity -import edu.uci.ics.amber.workflow.OutputPort.OutputMode.SINGLE_SNAPSHOT -import edu.uci.ics.amber.workflow.{PhysicalLink, PortIdentity} +import edu.uci.ics.amber.core.virtualidentity.OperatorIdentity +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode.SINGLE_SNAPSHOT +import edu.uci.ics.amber.core.workflow.{PhysicalLink, PortIdentity} import edu.uci.ics.texera.web.model.websocket.request.LogicalPlanPojo import edu.uci.ics.texera.web.service.ExecutionsMetadataPersistService diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/TrivialControlSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/TrivialControlSpec.scala index f24fa17becb..0fe1c9aafb3 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/TrivialControlSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/TrivialControlSpec.scala @@ -20,7 +20,7 @@ import edu.uci.ics.amber.engine.common.ambermessage.WorkflowFIFOMessage import edu.uci.ics.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} import io.grpc.MethodDescriptor import org.scalatest.wordspec.AnyWordSpecLike import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach} diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/MultiCallHandler.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/MultiCallHandler.scala index b1fdb1c46bb..b8f8bbef476 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/MultiCallHandler.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/MultiCallHandler.scala @@ -3,7 +3,7 @@ package edu.uci.ics.amber.engine.architecture.control.utils import com.twitter.util.Future import edu.uci.ics.amber.engine.architecture.rpc.controlcommands._ import edu.uci.ics.amber.engine.architecture.rpc.controlreturns._ -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity trait MultiCallHandler { this: TesterAsyncRPCHandlerInitializer => diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/TesterAsyncRPCHandlerInitializer.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/TesterAsyncRPCHandlerInitializer.scala index 4b1d0130c96..5ddbbc2348f 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/TesterAsyncRPCHandlerInitializer.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/TesterAsyncRPCHandlerInitializer.scala @@ -5,7 +5,7 @@ import edu.uci.ics.amber.engine.architecture.control.utils.TrivialControlTester. import edu.uci.ics.amber.engine.architecture.rpc.controlcommands.AsyncRPCContext import edu.uci.ics.amber.engine.architecture.rpc.testerservice.RPCTesterFs2Grpc import edu.uci.ics.amber.engine.common.rpc.{AsyncRPCHandlerInitializer, AsyncRPCServer} -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity class TesterAsyncRPCHandlerInitializer( val myID: ActorVirtualIdentity, diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/TrivialControlTester.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/TrivialControlTester.scala index 1cf91bc9f21..cef7469114c 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/TrivialControlTester.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/control/utils/TrivialControlTester.scala @@ -15,7 +15,7 @@ import edu.uci.ics.amber.engine.common.ambermessage.{ WorkflowFIFOMessage } import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} object TrivialControlTester { class ControlTesterRPCClient(outputGateway: NetworkOutputGateway, actorId: ActorVirtualIdentity) diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/NetworkInputGatewaySpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/NetworkInputGatewaySpec.scala index 18a401444ac..2203ff7f2a9 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/NetworkInputGatewaySpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/NetworkInputGatewaySpec.scala @@ -2,7 +2,7 @@ package edu.uci.ics.amber.engine.architecture.messaginglayer import edu.uci.ics.amber.core.tuple.{AttributeType, Schema, TupleLike} import edu.uci.ics.amber.engine.common.ambermessage.{DataFrame, WorkflowFIFOMessage} -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} import org.scalamock.scalatest.MockFactory import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/OutputManagerSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/OutputManagerSpec.scala index 0cfb9c4f753..916f6cf3e81 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/OutputManagerSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/OutputManagerSpec.scala @@ -5,13 +5,13 @@ import edu.uci.ics.amber.core.marker.EndOfInputChannel import edu.uci.ics.amber.core.tuple.{AttributeType, Schema, TupleLike} import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning import edu.uci.ics.amber.engine.common.ambermessage._ -import edu.uci.ics.amber.virtualidentity.{ +import edu.uci.ics.amber.core.virtualidentity.{ ActorVirtualIdentity, ChannelIdentity, OperatorIdentity, PhysicalOpIdentity } -import edu.uci.ics.amber.workflow.{PhysicalLink, PortIdentity} +import edu.uci.ics.amber.core.workflow.{PhysicalLink, PortIdentity} import org.scalamock.scalatest.MockFactory import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/RangeBasedShuffleSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/RangeBasedShuffleSpec.scala index 721eb6f509c..59034227074 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/RangeBasedShuffleSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/RangeBasedShuffleSpec.scala @@ -3,7 +3,7 @@ package edu.uci.ics.amber.engine.architecture.messaginglayer import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple} import edu.uci.ics.amber.engine.architecture.sendsemantics.partitioners.RangeBasedShufflePartitioner import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.RangeBasedShufflePartitioning -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} import org.scalamock.scalatest.MockFactory import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonWorkflowWorkerSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonWorkflowWorkerSpec.scala index 3e2a3642ae9..9a5ae6c99c5 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonWorkflowWorkerSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/pythonworker/PythonWorkflowWorkerSpec.scala @@ -21,7 +21,7 @@ //} //import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.{ControlInvocation, ReturnInvocation} //import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER -//import edu.uci.ics.amber.virtualidentity.{ +//import edu.uci.ics.amber.core.virtualidentity.{ // ActorVirtualIdentity, // PhysicalLink, // PhysicalLink, diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/scheduling/CostBasedScheduleGeneratorSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/scheduling/CostBasedScheduleGeneratorSpec.scala index d67524555e7..708e8ff7ad4 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/scheduling/CostBasedScheduleGeneratorSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/scheduling/CostBasedScheduleGeneratorSpec.scala @@ -4,7 +4,7 @@ import edu.uci.ics.amber.core.workflow.WorkflowContext import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER import edu.uci.ics.amber.engine.e2e.TestUtils.buildWorkflow import edu.uci.ics.amber.operator.TestOperators -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity import edu.uci.ics.texera.workflow.LogicalLink import org.scalamock.scalatest.MockFactory import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGeneratorSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGeneratorSpec.scala index c28c3265a20..93363e1fdf4 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGeneratorSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/scheduling/ExpansionGreedyScheduleGeneratorSpec.scala @@ -5,8 +5,8 @@ import edu.uci.ics.amber.engine.e2e.TestUtils.buildWorkflow import edu.uci.ics.amber.operator.TestOperators import edu.uci.ics.amber.operator.split.SplitOpDesc import edu.uci.ics.amber.operator.udf.python.{DualInputPortsPythonUDFOpDescV2, PythonUDFOpDescV2} -import edu.uci.ics.amber.virtualidentity.OperatorIdentity -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.virtualidentity.OperatorIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity import edu.uci.ics.texera.workflow.LogicalLink import org.scalamock.scalatest.MockFactory import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/worker/DPThreadSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/worker/DPThreadSpec.scala index 1eac2a1d909..8c8cedefcb7 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/worker/DPThreadSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/worker/DPThreadSpec.scala @@ -18,8 +18,8 @@ import edu.uci.ics.amber.engine.common.ambermessage.{DataFrame, WorkflowFIFOMess import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage import edu.uci.ics.amber.engine.common.virtualidentity.util.SELF -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import edu.uci.ics.amber.core.workflow.PortIdentity import org.scalamock.scalatest.MockFactory import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/worker/DataProcessorSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/worker/DataProcessorSpec.scala index 0b9f22823ca..a3b62cfabca 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/worker/DataProcessorSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/worker/DataProcessorSpec.scala @@ -16,13 +16,13 @@ import edu.uci.ics.amber.engine.common.ambermessage.{DataFrame, MarkerFrame, Wor import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER import edu.uci.ics.amber.util.VirtualIdentityUtils -import edu.uci.ics.amber.virtualidentity.{ +import edu.uci.ics.amber.core.virtualidentity.{ ActorVirtualIdentity, ChannelIdentity, OperatorIdentity, PhysicalOpIdentity } -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity import org.scalamock.scalatest.MockFactory import org.scalatest.BeforeAndAfterEach import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/worker/WorkerSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/worker/WorkerSpec.scala index f723a9bd7af..aab2548242a 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/worker/WorkerSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/worker/WorkerSpec.scala @@ -20,13 +20,13 @@ import edu.uci.ics.amber.engine.common.AmberRuntime import edu.uci.ics.amber.engine.common.ambermessage.{DataFrame, DataPayload, WorkflowFIFOMessage} import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER -import edu.uci.ics.amber.virtualidentity.{ +import edu.uci.ics.amber.core.virtualidentity.{ ActorVirtualIdentity, ChannelIdentity, OperatorIdentity, PhysicalOpIdentity } -import edu.uci.ics.amber.workflow.{PhysicalLink, PortIdentity} +import edu.uci.ics.amber.core.workflow.{PhysicalLink, PortIdentity} import org.scalamock.scalatest.MockFactory import org.scalatest.BeforeAndAfterAll import org.scalatest.flatspec.AnyFlatSpecLike diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/BatchSizePropagationSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/BatchSizePropagationSpec.scala index a62d37ca284..9eca6949048 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/BatchSizePropagationSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/BatchSizePropagationSpec.scala @@ -12,7 +12,7 @@ import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER import edu.uci.ics.amber.engine.e2e.TestUtils.buildWorkflow import edu.uci.ics.amber.operator.TestOperators import edu.uci.ics.amber.operator.aggregate.AggregationFunction -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity import edu.uci.ics.texera.workflow.LogicalLink import org.scalatest.flatspec.AnyFlatSpecLike import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach} 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 2f6f8ab67d5..9ef3a1ae101 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 @@ -18,8 +18,8 @@ import edu.uci.ics.amber.engine.common.client.AmberClient import edu.uci.ics.amber.engine.e2e.TestUtils.buildWorkflow import edu.uci.ics.amber.operator.TestOperators import edu.uci.ics.amber.operator.aggregate.AggregationFunction -import edu.uci.ics.amber.virtualidentity.OperatorIdentity -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.virtualidentity.OperatorIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity import edu.uci.ics.texera.workflow.LogicalLink import org.scalatest.flatspec.AnyFlatSpecLike import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach} 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 014f3080b98..c1b0f319c50 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 @@ -15,7 +15,7 @@ import edu.uci.ics.amber.engine.architecture.rpc.controlreturns.WorkflowAggregat import edu.uci.ics.amber.engine.common.AmberRuntime import edu.uci.ics.amber.engine.common.client.AmberClient import edu.uci.ics.amber.operator.{LogicalOp, TestOperators} -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity import edu.uci.ics.texera.workflow.LogicalLink import org.scalatest.BeforeAndAfterAll import org.scalatest.flatspec.AnyFlatSpecLike diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/faulttolerance/CheckpointSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/faulttolerance/CheckpointSpec.scala index 6c694b989c1..cd423741b10 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/faulttolerance/CheckpointSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/faulttolerance/CheckpointSpec.scala @@ -12,7 +12,7 @@ import edu.uci.ics.amber.engine.common.virtualidentity.util.{CONTROLLER, SELF} import edu.uci.ics.amber.engine.common.{AmberRuntime, CheckpointState} import edu.uci.ics.amber.engine.e2e.TestUtils.buildWorkflow import edu.uci.ics.amber.operator.TestOperators -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity import edu.uci.ics.texera.workflow.LogicalLink import org.scalatest.BeforeAndAfterAll import org.scalatest.flatspec.AnyFlatSpecLike diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/faulttolerance/LoggingSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/faulttolerance/LoggingSpec.scala index 42962ef3352..fade388c4ff 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/faulttolerance/LoggingSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/faulttolerance/LoggingSpec.scala @@ -25,13 +25,13 @@ import edu.uci.ics.amber.engine.common.ambermessage.{ import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage import edu.uci.ics.amber.engine.common.virtualidentity.util.{CONTROLLER, SELF} -import edu.uci.ics.amber.virtualidentity.{ +import edu.uci.ics.amber.core.virtualidentity.{ ActorVirtualIdentity, ChannelIdentity, OperatorIdentity, PhysicalOpIdentity } -import edu.uci.ics.amber.workflow.{PhysicalLink, PortIdentity} +import edu.uci.ics.amber.core.workflow.{PhysicalLink, PortIdentity} import org.scalatest.BeforeAndAfterAll import org.scalatest.flatspec.AnyFlatSpecLike diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/faulttolerance/ReplaySpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/faulttolerance/ReplaySpec.scala index d52402798ea..3a2a9b9ba88 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/faulttolerance/ReplaySpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/faulttolerance/ReplaySpec.scala @@ -16,7 +16,7 @@ import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage.SequentialRecordReader import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER -import edu.uci.ics.amber.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} import org.scalatest.BeforeAndAfterAll import org.scalatest.flatspec.AnyFlatSpecLike diff --git a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/WorkflowCompiler.scala b/core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/WorkflowCompiler.scala index 4a50f33f806..6dd8ebbce50 100644 --- a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/WorkflowCompiler.scala +++ b/core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/WorkflowCompiler.scala @@ -10,10 +10,10 @@ import edu.uci.ics.amber.compiler.WorkflowCompiler.{ import edu.uci.ics.amber.compiler.model.{LogicalPlan, LogicalPlanPojo} import edu.uci.ics.amber.core.tuple.Schema import edu.uci.ics.amber.core.workflow.{PhysicalPlan, WorkflowContext} -import edu.uci.ics.amber.virtualidentity.OperatorIdentity -import edu.uci.ics.amber.workflow.PhysicalLink -import edu.uci.ics.amber.workflowruntimestate.FatalErrorType.COMPILATION_ERROR -import edu.uci.ics.amber.workflowruntimestate.WorkflowFatalError +import edu.uci.ics.amber.core.virtualidentity.OperatorIdentity +import edu.uci.ics.amber.core.workflow.PhysicalLink +import edu.uci.ics.amber.core.workflowruntimestate.FatalErrorType.COMPILATION_ERROR +import edu.uci.ics.amber.core.workflowruntimestate.WorkflowFatalError import java.time.Instant import scala.collection.mutable diff --git a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/model/LogicalLink.scala b/core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/model/LogicalLink.scala index 283526132a5..bf9217128b2 100644 --- a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/model/LogicalLink.scala +++ b/core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/model/LogicalLink.scala @@ -1,8 +1,8 @@ package edu.uci.ics.amber.compiler.model import com.fasterxml.jackson.annotation.{JsonCreator, JsonProperty} -import edu.uci.ics.amber.virtualidentity.OperatorIdentity -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.virtualidentity.OperatorIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity case class LogicalLink( @JsonProperty("fromOpId") fromOpId: OperatorIdentity, diff --git a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/model/LogicalPlan.scala b/core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/model/LogicalPlan.scala index 8b599176cd7..ea79ba5ceb7 100644 --- a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/model/LogicalPlan.scala +++ b/core/workflow-compiling-service/src/main/scala/edu/uci/ics/amber/compiler/model/LogicalPlan.scala @@ -7,8 +7,8 @@ import edu.uci.ics.amber.core.workflow.WorkflowContext import edu.uci.ics.amber.operator.LogicalOp import edu.uci.ics.amber.operator.source.SourceOperatorDescriptor import edu.uci.ics.amber.operator.source.scan.ScanSourceOpDesc -import edu.uci.ics.amber.virtualidentity.OperatorIdentity -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.virtualidentity.OperatorIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity import org.jgrapht.graph.DirectedAcyclicGraph import org.jgrapht.util.SupplierUtil diff --git a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/texera/service/resource/WorkflowCompilationResource.scala b/core/workflow-compiling-service/src/main/scala/edu/uci/ics/texera/service/resource/WorkflowCompilationResource.scala index a167e46203b..1492d7f7d48 100644 --- a/core/workflow-compiling-service/src/main/scala/edu/uci/ics/texera/service/resource/WorkflowCompilationResource.scala +++ b/core/workflow-compiling-service/src/main/scala/edu/uci/ics/texera/service/resource/WorkflowCompilationResource.scala @@ -6,8 +6,8 @@ import edu.uci.ics.amber.compiler.WorkflowCompiler import edu.uci.ics.amber.compiler.model.LogicalPlanPojo import edu.uci.ics.amber.core.tuple.Attribute import edu.uci.ics.amber.core.workflow.{PhysicalPlan, WorkflowContext} -import edu.uci.ics.amber.virtualidentity.WorkflowIdentity -import edu.uci.ics.amber.workflowruntimestate.WorkflowFatalError +import edu.uci.ics.amber.core.virtualidentity.WorkflowIdentity +import edu.uci.ics.amber.core.workflowruntimestate.WorkflowFatalError import jakarta.annotation.security.RolesAllowed import jakarta.ws.rs.{Consumes, POST, Path, Produces} import jakarta.ws.rs.core.MediaType diff --git a/core/workflow-compiling-service/src/test/scala/edu/uci/ics/texera/service/resource/WorkflowCompilationResourceSpec.scala b/core/workflow-compiling-service/src/test/scala/edu/uci/ics/texera/service/resource/WorkflowCompilationResourceSpec.scala index 669df1e6e60..94150bee341 100644 --- a/core/workflow-compiling-service/src/test/scala/edu/uci/ics/texera/service/resource/WorkflowCompilationResourceSpec.scala +++ b/core/workflow-compiling-service/src/test/scala/edu/uci/ics/texera/service/resource/WorkflowCompilationResourceSpec.scala @@ -8,7 +8,7 @@ import edu.uci.ics.amber.compiler.model.{LogicalLink, LogicalPlanPojo} import edu.uci.ics.amber.operator.projection.{AttributeUnit, ProjectionOpDesc} import edu.uci.ics.amber.operator.source.scan.csv.CSVScanSourceOpDesc import edu.uci.ics.amber.util.JSONUtils.objectMapper -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.BeforeAndAfterAll import com.fasterxml.jackson.databind.node.ObjectNode diff --git a/core/workflow-core/src/main/protobuf/edu/uci/ics/amber/virtualidentity.proto b/core/workflow-core/src/main/protobuf/edu/uci/ics/amber/core/virtualidentity.proto similarity index 95% rename from core/workflow-core/src/main/protobuf/edu/uci/ics/amber/virtualidentity.proto rename to core/workflow-core/src/main/protobuf/edu/uci/ics/amber/core/virtualidentity.proto index 272e94954a1..e8ed027ab0a 100644 --- a/core/workflow-core/src/main/protobuf/edu/uci/ics/amber/virtualidentity.proto +++ b/core/workflow-core/src/main/protobuf/edu/uci/ics/amber/core/virtualidentity.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package edu.uci.ics.amber; +package edu.uci.ics.amber.core; import "scalapb/scalapb.proto"; diff --git a/core/workflow-core/src/main/protobuf/edu/uci/ics/amber/workflow.proto b/core/workflow-core/src/main/protobuf/edu/uci/ics/amber/core/workflow.proto similarity index 93% rename from core/workflow-core/src/main/protobuf/edu/uci/ics/amber/workflow.proto rename to core/workflow-core/src/main/protobuf/edu/uci/ics/amber/core/workflow.proto index 0ee4c68d36a..55180f3aa6d 100644 --- a/core/workflow-core/src/main/protobuf/edu/uci/ics/amber/workflow.proto +++ b/core/workflow-core/src/main/protobuf/edu/uci/ics/amber/core/workflow.proto @@ -1,8 +1,8 @@ syntax = "proto3"; -package edu.uci.ics.amber; +package edu.uci.ics.amber.core; -import "edu/uci/ics/amber/virtualidentity.proto"; +import "edu/uci/ics/amber/core/virtualidentity.proto"; import "scalapb/scalapb.proto"; option (scalapb.options) = { diff --git a/core/workflow-core/src/main/protobuf/edu/uci/ics/amber/workflowruntimestate.proto b/core/workflow-core/src/main/protobuf/edu/uci/ics/amber/core/workflowruntimestate.proto similarity index 94% rename from core/workflow-core/src/main/protobuf/edu/uci/ics/amber/workflowruntimestate.proto rename to core/workflow-core/src/main/protobuf/edu/uci/ics/amber/core/workflowruntimestate.proto index 60af1c1e3a7..2666e7074a6 100644 --- a/core/workflow-core/src/main/protobuf/edu/uci/ics/amber/workflowruntimestate.proto +++ b/core/workflow-core/src/main/protobuf/edu/uci/ics/amber/core/workflowruntimestate.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package edu.uci.ics.amber; +package edu.uci.ics.amber.core; import "google/protobuf/timestamp.proto"; import "scalapb/scalapb.proto"; diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/WorkflowRuntimeException.scala b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/WorkflowRuntimeException.scala index ba333a5f499..443a3b3cf4f 100644 --- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/WorkflowRuntimeException.scala +++ b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/WorkflowRuntimeException.scala @@ -1,6 +1,6 @@ package edu.uci.ics.amber.core -import edu.uci.ics.amber.virtualidentity.ActorVirtualIdentity +import edu.uci.ics.amber.core.virtualidentity.ActorVirtualIdentity class WorkflowRuntimeException( val message: String, diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/OperatorExecutor.scala b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/OperatorExecutor.scala index f286d7e6aca..a718b4a409f 100644 --- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/OperatorExecutor.scala +++ b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/OperatorExecutor.scala @@ -2,7 +2,7 @@ package edu.uci.ics.amber.core.executor import edu.uci.ics.amber.core.marker.State import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike} -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity trait OperatorExecutor { diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/SinkOperatorExecutor.scala b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/SinkOperatorExecutor.scala index 50ec79f3a8e..9b4cd31b84d 100644 --- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/SinkOperatorExecutor.scala +++ b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/SinkOperatorExecutor.scala @@ -1,7 +1,7 @@ package edu.uci.ics.amber.core.executor import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike} -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity trait SinkOperatorExecutor extends OperatorExecutor { diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/SourceOperatorExecutor.scala b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/SourceOperatorExecutor.scala index efa6fd40bcc..84685c59a59 100644 --- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/SourceOperatorExecutor.scala +++ b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/executor/SourceOperatorExecutor.scala @@ -1,7 +1,7 @@ package edu.uci.ics.amber.core.executor import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike} -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity trait SourceOperatorExecutor extends OperatorExecutor { override def open(): Unit = {} diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/OpResultStorage.scala b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/OpResultStorage.scala index 42728231270..83c25a2488b 100644 --- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/OpResultStorage.scala +++ b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/OpResultStorage.scala @@ -4,8 +4,8 @@ import com.typesafe.scalalogging.LazyLogging import edu.uci.ics.amber.core.storage.StorageConfig import edu.uci.ics.amber.core.storage.model.VirtualDocument import edu.uci.ics.amber.core.tuple.{Schema, Tuple} -import edu.uci.ics.amber.virtualidentity.OperatorIdentity -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.virtualidentity.OperatorIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity import java.util.concurrent.ConcurrentHashMap import scala.jdk.CollectionConverters.IteratorHasAsScala diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/ResultStorage.scala b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/ResultStorage.scala index 1e9168d15a2..701ee9c01fe 100644 --- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/ResultStorage.scala +++ b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/ResultStorage.scala @@ -1,6 +1,6 @@ package edu.uci.ics.amber.core.storage.result -import edu.uci.ics.amber.virtualidentity.WorkflowIdentity +import edu.uci.ics.amber.core.virtualidentity.WorkflowIdentity import scala.collection.mutable diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/WorkflowResultStore.scala b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/WorkflowResultStore.scala index beb83632147..8dfd30e2f62 100644 --- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/WorkflowResultStore.scala +++ b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/result/WorkflowResultStore.scala @@ -1,6 +1,6 @@ package edu.uci.ics.amber.core.storage.result -import edu.uci.ics.amber.virtualidentity.OperatorIdentity +import edu.uci.ics.amber.core.virtualidentity.OperatorIdentity case class OperatorResultMetadata(tupleCount: Int = 0, changeDetector: String = "") diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/util/mongo/MongoCollectionManager.scala b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/util/mongo/MongoCollectionManager.scala index 96cd5c902a9..b3f650450f8 100644 --- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/util/mongo/MongoCollectionManager.scala +++ b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/storage/util/mongo/MongoCollectionManager.scala @@ -1,6 +1,6 @@ package edu.uci.ics.amber.core.storage.util.mongo -import com.mongodb.client.model.{Aggregates, IndexOptions, Indexes, Sorts} +import com.mongodb.client.model.{Aggregates, Sorts} import com.mongodb.client.{FindIterable, MongoCollection} import org.bson.Document diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/TupleLike.scala b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/TupleLike.scala index 16eddf5a8f9..206590d4d5f 100644 --- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/TupleLike.scala +++ b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/tuple/TupleLike.scala @@ -1,6 +1,6 @@ package edu.uci.ics.amber.core.tuple -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity import scala.jdk.CollectionConverters.CollectionHasAsScala diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/PhysicalOp.scala b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/PhysicalOp.scala index 99631e4aa46..daf7cd679f9 100644 --- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/PhysicalOp.scala +++ b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/PhysicalOp.scala @@ -4,13 +4,13 @@ import com.fasterxml.jackson.annotation.{JsonIgnore, JsonIgnoreProperties} import com.typesafe.scalalogging.LazyLogging import edu.uci.ics.amber.core.executor.{OpExecInitInfo, OpExecInitInfoWithCode} import edu.uci.ics.amber.core.tuple.Schema -import edu.uci.ics.amber.virtualidentity.{ +import edu.uci.ics.amber.core.virtualidentity.{ ExecutionIdentity, OperatorIdentity, PhysicalOpIdentity, WorkflowIdentity } -import edu.uci.ics.amber.workflow.{InputPort, OutputPort, PhysicalLink, PortIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PhysicalLink, PortIdentity} import org.jgrapht.graph.{DefaultEdge, DirectedAcyclicGraph} import org.jgrapht.traverse.TopologicalOrderIterator diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/PhysicalPlan.scala b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/PhysicalPlan.scala index ce8070a1aa7..a405ea646da 100644 --- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/PhysicalPlan.scala +++ b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/PhysicalPlan.scala @@ -3,12 +3,12 @@ package edu.uci.ics.amber.core.workflow import com.fasterxml.jackson.annotation.JsonIgnore import com.typesafe.scalalogging.LazyLogging import edu.uci.ics.amber.util.VirtualIdentityUtils -import edu.uci.ics.amber.virtualidentity.{ +import edu.uci.ics.amber.core.virtualidentity.{ ActorVirtualIdentity, OperatorIdentity, PhysicalOpIdentity } -import edu.uci.ics.amber.workflow.PhysicalLink +import edu.uci.ics.amber.core.workflow.PhysicalLink import org.jgrapht.alg.connectivity.BiconnectivityInspector import org.jgrapht.alg.shortestpath.AllDirectedPaths import org.jgrapht.graph.DirectedAcyclicGraph diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/WorkflowContext.scala b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/WorkflowContext.scala index abb776b1cad..28b9bb31858 100644 --- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/WorkflowContext.scala +++ b/core/workflow-core/src/main/scala/edu/uci/ics/amber/core/workflow/WorkflowContext.scala @@ -5,7 +5,7 @@ import edu.uci.ics.amber.core.workflow.WorkflowContext.{ DEFAULT_WORKFLOW_ID, DEFAULT_WORKFLOW_SETTINGS } -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} object WorkflowContext { val DEFAULT_EXECUTION_ID: ExecutionIdentity = ExecutionIdentity(1L) diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/JSONUtils.scala b/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/JSONUtils.scala index d87145c5000..9156ecc6088 100644 --- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/JSONUtils.scala +++ b/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/JSONUtils.scala @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.{JsonNode, ObjectMapper} import com.fasterxml.jackson.module.noctordeser.NoCtorDeserModule import com.fasterxml.jackson.module.scala.DefaultScalaModule import edu.uci.ics.amber.util.serde.{PortIdentityKeyDeserializer, PortIdentityKeySerializer} -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity import java.text.SimpleDateFormat import scala.jdk.CollectionConverters.IteratorHasAsScala diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/VirtualIdentityUtils.scala b/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/VirtualIdentityUtils.scala index f38bb9577bb..9b30d85ee2e 100644 --- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/VirtualIdentityUtils.scala +++ b/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/VirtualIdentityUtils.scala @@ -1,6 +1,6 @@ package edu.uci.ics.amber.util -import edu.uci.ics.amber.virtualidentity.{ +import edu.uci.ics.amber.core.virtualidentity.{ ActorVirtualIdentity, OperatorIdentity, PhysicalOpIdentity, diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/serde/PortIdentityKeyDeserializer.scala b/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/serde/PortIdentityKeyDeserializer.scala index 8f2691540fd..9105d4bb661 100644 --- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/serde/PortIdentityKeyDeserializer.scala +++ b/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/serde/PortIdentityKeyDeserializer.scala @@ -1,7 +1,7 @@ package edu.uci.ics.amber.util.serde import com.fasterxml.jackson.databind.{DeserializationContext, KeyDeserializer} -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity class PortIdentityKeyDeserializer extends KeyDeserializer { override def deserializeKey(key: String, ctxt: DeserializationContext): PortIdentity = { diff --git a/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/serde/PortIdentityKeySerializer.scala b/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/serde/PortIdentityKeySerializer.scala index 1bf3a7f276f..a18a3970be3 100644 --- a/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/serde/PortIdentityKeySerializer.scala +++ b/core/workflow-core/src/main/scala/edu/uci/ics/amber/util/serde/PortIdentityKeySerializer.scala @@ -2,7 +2,7 @@ package edu.uci.ics.amber.util.serde import com.fasterxml.jackson.core.JsonGenerator import com.fasterxml.jackson.databind.{JsonSerializer, SerializerProvider} -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity class PortIdentityKeySerializer extends JsonSerializer[PortIdentity] { override def serialize( diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/LogicalOp.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/LogicalOp.scala index e374fac80c7..08e750ed8c3 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/LogicalOp.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/LogicalOp.scala @@ -94,8 +94,12 @@ import edu.uci.ics.amber.operator.visualization.ternaryPlot.TernaryPlotOpDesc import edu.uci.ics.amber.operator.visualization.urlviz.UrlVizOpDesc import edu.uci.ics.amber.operator.visualization.waterfallChart.WaterfallChartOpDesc import edu.uci.ics.amber.operator.visualization.wordCloud.WordCloudOpDesc -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, OperatorIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.virtualidentity.{ + ExecutionIdentity, + OperatorIdentity, + WorkflowIdentity +} +import edu.uci.ics.amber.core.workflow.PortIdentity import org.apache.commons.lang3.builder.{EqualsBuilder, HashCodeBuilder, ToStringBuilder} import java.util.UUID diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/PythonOperatorDescriptor.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/PythonOperatorDescriptor.scala index 04991ef2530..c5cc4fd152f 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/PythonOperatorDescriptor.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/PythonOperatorDescriptor.scala @@ -2,7 +2,7 @@ package edu.uci.ics.amber.operator import edu.uci.ics.amber.core.executor.OpExecInitInfoWithCode import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} trait PythonOperatorDescriptor extends LogicalOp { override def getPhysicalOp( diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/SpecialPhysicalOpFactory.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/SpecialPhysicalOpFactory.scala index 64028a3fef8..96776d36b62 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/SpecialPhysicalOpFactory.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/SpecialPhysicalOpFactory.scala @@ -7,15 +7,18 @@ import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.operator.sink.ProgressiveUtils import edu.uci.ics.amber.operator.sink.managed.ProgressiveSinkOpExec import edu.uci.ics.amber.operator.source.cache.CacheSourceOpExec -import edu.uci.ics.amber.virtualidentity.{ +import edu.uci.ics.amber.core.virtualidentity.{ ExecutionIdentity, - OperatorIdentity, PhysicalOpIdentity, WorkflowIdentity } -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.OutputPort.OutputMode.{SET_DELTA, SET_SNAPSHOT, SINGLE_SNAPSHOT} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort, PortIdentity} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode.{ + SET_DELTA, + SET_SNAPSHOT, + SINGLE_SNAPSHOT +} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity} object SpecialPhysicalOpFactory { def newSinkPhysicalOp( diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/aggregate/AggregateOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/aggregate/AggregateOpDesc.scala index 84559fbf6ab..b27c9cac387 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/aggregate/AggregateOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/aggregate/AggregateOpDesc.scala @@ -13,8 +13,12 @@ import edu.uci.ics.amber.core.workflow.{ import edu.uci.ics.amber.operator.LogicalOp import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeNameList import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, PhysicalOpIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort, PhysicalLink, PortIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ + ExecutionIdentity, + PhysicalOpIdentity, + WorkflowIdentity +} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PhysicalLink, PortIdentity} import javax.validation.constraints.{NotNull, Size} diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/cartesianProduct/CartesianProductOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/cartesianProduct/CartesianProductOpDesc.scala index 8ca092feb6b..2be0c18e598 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/cartesianProduct/CartesianProductOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/cartesianProduct/CartesianProductOpDesc.scala @@ -5,8 +5,8 @@ import edu.uci.ics.amber.core.tuple.{Attribute, Schema} import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.operator.LogicalOp import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort, PortIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity} class CartesianProductOpDesc extends LogicalOp { override def getPhysicalOp( diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/dictionary/DictionaryMatcherOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/dictionary/DictionaryMatcherOpDesc.scala index b3ef4ea3538..6921cccfba7 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/dictionary/DictionaryMatcherOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/dictionary/DictionaryMatcherOpDesc.scala @@ -8,8 +8,8 @@ import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.operator.map.MapOpDesc import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} /** * Dictionary matcher operator matches a tuple if the specified column is in the given dictionary. diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/difference/DifferenceOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/difference/DifferenceOpDesc.scala index 8df2eaac6a5..a8c25ad2363 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/difference/DifferenceOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/difference/DifferenceOpDesc.scala @@ -6,8 +6,8 @@ import edu.uci.ics.amber.core.tuple.Schema import edu.uci.ics.amber.core.workflow.{HashPartition, PhysicalOp} import edu.uci.ics.amber.operator.LogicalOp import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort, PortIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity} class DifferenceOpDesc extends LogicalOp { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/distinct/DistinctOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/distinct/DistinctOpDesc.scala index 37d9e264c18..ae00eb38c10 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/distinct/DistinctOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/distinct/DistinctOpDesc.scala @@ -6,8 +6,8 @@ import edu.uci.ics.amber.core.tuple.Schema import edu.uci.ics.amber.core.workflow.{HashPartition, PhysicalOp} import edu.uci.ics.amber.operator.LogicalOp import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} class DistinctOpDesc extends LogicalOp { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/dummy/DummyOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/dummy/DummyOpDesc.scala index a434800007c..75ce5a933cd 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/dummy/DummyOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/dummy/DummyOpDesc.scala @@ -5,7 +5,7 @@ import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.core.tuple.Schema import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.{LogicalOp, PortDescription, PortDescriptor} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort, PortIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity} class DummyOpDesc extends LogicalOp with PortDescriptor { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/FilterOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/FilterOpDesc.scala index 4e871e158d6..28c5e44a981 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/FilterOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/FilterOpDesc.scala @@ -4,7 +4,7 @@ import com.google.common.base.Preconditions import edu.uci.ics.amber.core.tuple.Schema import edu.uci.ics.amber.core.workflow.PhysicalOp import edu.uci.ics.amber.operator.{LogicalOp, StateTransferFunc} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import scala.util.{Success, Try} diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/SpecializedFilterOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/SpecializedFilterOpDesc.scala index 770334dc396..61b87009377 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/SpecializedFilterOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/filter/SpecializedFilterOpDesc.scala @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import edu.uci.ics.amber.core.executor.OpExecInitInfo import edu.uci.ics.amber.core.workflow.PhysicalOp import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} class SpecializedFilterOpDesc extends FilterOpDesc { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/hashJoin/HashJoinOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/hashJoin/HashJoinOpDesc.scala index c40d736d135..fe009a91989 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/hashJoin/HashJoinOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/hashJoin/HashJoinOpDesc.scala @@ -6,8 +6,12 @@ import edu.uci.ics.amber.core.executor.OpExecInitInfo import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.core.workflow._ import edu.uci.ics.amber.operator.LogicalOp -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, PhysicalOpIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort, PhysicalLink, PortIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ + ExecutionIdentity, + PhysicalOpIdentity, + WorkflowIdentity +} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PhysicalLink, PortIdentity} import edu.uci.ics.amber.operator.hashJoin.HashJoinOpDesc.HASH_JOIN_INTERNAL_KEY_NAME import edu.uci.ics.amber.operator.metadata.annotations.{ AutofillAttributeName, diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceIrisLogisticRegressionOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceIrisLogisticRegressionOpDesc.scala index 6ca510bc91f..a4efb8226cb 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceIrisLogisticRegressionOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceIrisLogisticRegressionOpDesc.scala @@ -5,7 +5,7 @@ import edu.uci.ics.amber.core.tuple.{AttributeType, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} class HuggingFaceIrisLogisticRegressionOpDesc extends PythonOperatorDescriptor { @JsonProperty(value = "petalLengthCmAttribute", required = true) diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceSentimentAnalysisOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceSentimentAnalysisOpDesc.scala index 339d042a204..04a603ed85c 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceSentimentAnalysisOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceSentimentAnalysisOpDesc.scala @@ -2,7 +2,7 @@ package edu.uci.ics.amber.operator.huggingFace import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import edu.uci.ics.amber.core.tuple.{AttributeType, Schema} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceSpamSMSDetectionOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceSpamSMSDetectionOpDesc.scala index 2d7d610e9c8..cf1c43dd701 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceSpamSMSDetectionOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceSpamSMSDetectionOpDesc.scala @@ -5,7 +5,7 @@ import edu.uci.ics.amber.core.tuple.{AttributeType, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} class HuggingFaceSpamSMSDetectionOpDesc extends PythonOperatorDescriptor { @JsonProperty(value = "attribute", required = true) @JsonPropertyDescription("column to perform spam detection on") diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceTextSummarizationOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceTextSummarizationOpDesc.scala index 0d9731be16c..349842369fb 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceTextSummarizationOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/huggingFace/HuggingFaceTextSummarizationOpDesc.scala @@ -2,7 +2,7 @@ package edu.uci.ics.amber.operator.huggingFace import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import edu.uci.ics.amber.core.tuple.{AttributeType, Schema} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/intersect/IntersectOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/intersect/IntersectOpDesc.scala index 6ee770cd7d5..8fc2e999ee7 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/intersect/IntersectOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/intersect/IntersectOpDesc.scala @@ -6,8 +6,8 @@ import edu.uci.ics.amber.core.tuple.Schema import edu.uci.ics.amber.core.workflow.{HashPartition, PhysicalOp} import edu.uci.ics.amber.operator.LogicalOp import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort, PortIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity} class IntersectOpDesc extends LogicalOp { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/intervalJoin/IntervalJoinOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/intervalJoin/IntervalJoinOpDesc.scala index 4c7dccbe6eb..d27792c044d 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/intervalJoin/IntervalJoinOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/intervalJoin/IntervalJoinOpDesc.scala @@ -12,8 +12,8 @@ import edu.uci.ics.amber.operator.metadata.annotations.{ AutofillAttributeName, AutofillAttributeNameOnPort1 } -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort, PortIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity} /** This Operator have two assumptions: * 1. The tuples in both inputs come in ascending order diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/keywordSearch/KeywordSearchOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/keywordSearch/KeywordSearchOpDesc.scala index a6c9ddfdda1..cf478610d56 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/keywordSearch/KeywordSearchOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/keywordSearch/KeywordSearchOpDesc.scala @@ -7,8 +7,8 @@ import edu.uci.ics.amber.core.workflow.PhysicalOp import edu.uci.ics.amber.operator.filter.FilterOpDesc import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} class KeywordSearchOpDesc extends FilterOpDesc { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/limit/LimitOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/limit/LimitOpDesc.scala index 6194620b214..b3cf15a0e40 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/limit/LimitOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/limit/LimitOpDesc.scala @@ -7,8 +7,8 @@ import edu.uci.ics.amber.core.tuple.Schema import edu.uci.ics.amber.core.workflow.PhysicalOp import edu.uci.ics.amber.operator.{LogicalOp, StateTransferFunc} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import scala.util.{Success, Try} diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/Scorer/MachineLearningScorerOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/Scorer/MachineLearningScorerOpDesc.scala index 16024cd6e8f..8183cf14e4c 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/Scorer/MachineLearningScorerOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/Scorer/MachineLearningScorerOpDesc.scala @@ -10,7 +10,7 @@ import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.{AutofillAttributeName, HideAnnotation} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} class MachineLearningScorerOpDesc extends PythonOperatorDescriptor { @JsonProperty(required = true, defaultValue = "false") diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/base/SklearnAdvancedBaseDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/base/SklearnAdvancedBaseDesc.scala index 2589e54687d..66467291eb0 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/base/SklearnAdvancedBaseDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/machineLearning/sklearnAdvanced/base/SklearnAdvancedBaseDesc.scala @@ -3,7 +3,7 @@ package edu.uci.ics.amber.operator.machineLearning.sklearnAdvanced.base import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort, PortIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity} import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.annotations.{ AutofillAttributeName, diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/map/MapOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/map/MapOpDesc.scala index d777d2bce14..5cce0ad9fb3 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/map/MapOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/map/MapOpDesc.scala @@ -2,7 +2,7 @@ package edu.uci.ics.amber.operator.map import edu.uci.ics.amber.core.workflow.PhysicalOp import edu.uci.ics.amber.operator.{LogicalOp, StateTransferFunc} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import scala.util.{Failure, Success, Try} diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/OperatorMetadataGenerator.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/OperatorMetadataGenerator.scala index 48b3cd23515..24ee456c1c4 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/OperatorMetadataGenerator.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/metadata/OperatorMetadataGenerator.scala @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.node.{ArrayNode, ObjectNode} import com.kjetland.jackson.jsonSchema.JsonSchemaConfig.html5EnabledSchema import com.kjetland.jackson.jsonSchema.{JsonSchemaConfig, JsonSchemaDraft, JsonSchemaGenerator} import edu.uci.ics.amber.operator.LogicalOp -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import edu.uci.ics.amber.operator.source.scan.csv.CSVScanSourceOpDesc import edu.uci.ics.amber.util.JSONUtils.objectMapper diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/projection/ProjectionOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/projection/ProjectionOpDesc.scala index f7051c07885..2bd6fc413fd 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/projection/ProjectionOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/projection/ProjectionOpDesc.scala @@ -9,8 +9,8 @@ import edu.uci.ics.amber.core.workflow.PhysicalOp.oneToOnePhysicalOp import edu.uci.ics.amber.core.workflow._ import edu.uci.ics.amber.operator.map.MapOpDesc import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} class ProjectionOpDesc extends MapOpDesc { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/randomksampling/RandomKSamplingOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/randomksampling/RandomKSamplingOpDesc.scala index 8e7f0601b2c..7fa187e70ee 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/randomksampling/RandomKSamplingOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/randomksampling/RandomKSamplingOpDesc.scala @@ -5,8 +5,8 @@ import edu.uci.ics.amber.core.executor.OpExecInitInfo import edu.uci.ics.amber.core.workflow.PhysicalOp import edu.uci.ics.amber.operator.filter.FilterOpDesc import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import scala.util.Random diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/regex/RegexOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/regex/RegexOpDesc.scala index 45f58edafd8..6d06c839943 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/regex/RegexOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/regex/RegexOpDesc.scala @@ -7,8 +7,8 @@ import edu.uci.ics.amber.core.workflow.PhysicalOp import edu.uci.ics.amber.operator.filter.FilterOpDesc import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} class RegexOpDesc extends FilterOpDesc { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/reservoirsampling/ReservoirSamplingOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/reservoirsampling/ReservoirSamplingOpDesc.scala index 8abc8801419..79ab7eadf1e 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/reservoirsampling/ReservoirSamplingOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/reservoirsampling/ReservoirSamplingOpDesc.scala @@ -7,8 +7,8 @@ import edu.uci.ics.amber.core.tuple.Schema import edu.uci.ics.amber.core.workflow.PhysicalOp import edu.uci.ics.amber.operator.LogicalOp import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import edu.uci.ics.amber.operator.util.OperatorDescriptorUtils.equallyPartitionGoal import scala.util.Random diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sentiment/SentimentAnalysisOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sentiment/SentimentAnalysisOpDesc.scala index 27a988d9f37..247e7893f23 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sentiment/SentimentAnalysisOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sentiment/SentimentAnalysisOpDesc.scala @@ -8,8 +8,8 @@ import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.operator.map.MapOpDesc import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} @JsonSchemaInject(json = """ { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sink/managed/ProgressiveSinkOpExec.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sink/managed/ProgressiveSinkOpExec.scala index 30a604ea924..bd0bd187c23 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sink/managed/ProgressiveSinkOpExec.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sink/managed/ProgressiveSinkOpExec.scala @@ -5,9 +5,9 @@ import edu.uci.ics.amber.core.storage.model.BufferedItemWriter import edu.uci.ics.amber.core.storage.result.ResultStorage import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike} import edu.uci.ics.amber.operator.sink.ProgressiveUtils -import edu.uci.ics.amber.virtualidentity.WorkflowIdentity -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.virtualidentity.WorkflowIdentity +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.PortIdentity class ProgressiveSinkOpExec( outputMode: OutputMode, diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnClassifierOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnClassifierOpDesc.scala index f41401dac12..09881901612 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnClassifierOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnClassifierOpDesc.scala @@ -15,7 +15,7 @@ import edu.uci.ics.amber.operator.metadata.annotations.{ CommonOpDescAnnotation, HideAnnotation } -import edu.uci.ics.amber.workflow.{InputPort, OutputPort, PortIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity} abstract class SklearnClassifierOpDesc extends PythonOperatorDescriptor { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnLinearRegressionOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnLinearRegressionOpDesc.scala index d464e41992d..a55cb953395 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnLinearRegressionOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnLinearRegressionOpDesc.scala @@ -6,7 +6,7 @@ import edu.uci.ics.amber.core.tuple.{AttributeType, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName -import edu.uci.ics.amber.workflow.{InputPort, OutputPort, PortIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity} class SklearnLinearRegressionOpDesc extends PythonOperatorDescriptor { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnPredictionOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnPredictionOpDesc.scala index 21a2595b537..a1d4c86eb7e 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnPredictionOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sklearn/SklearnPredictionOpDesc.scala @@ -8,7 +8,7 @@ import edu.uci.ics.amber.operator.metadata.annotations.{ AutofillAttributeName, AutofillAttributeNameOnPort1 } -import edu.uci.ics.amber.workflow.{InputPort, OutputPort, PortIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity} class SklearnPredictionOpDesc extends PythonOperatorDescriptor { @JsonProperty(value = "Model Attribute", required = true, defaultValue = "model") diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sort/SortOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sort/SortOpDesc.scala index 4836001fc8d..39af6cd63a9 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sort/SortOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sort/SortOpDesc.scala @@ -2,7 +2,7 @@ package edu.uci.ics.amber.operator.sort import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import edu.uci.ics.amber.core.tuple.Schema -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} class SortOpDesc extends PythonOperatorDescriptor { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sortPartitions/SortPartitionsOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sortPartitions/SortPartitionsOpDesc.scala index b13f5bfe88d..73366908cb1 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sortPartitions/SortPartitionsOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/sortPartitions/SortPartitionsOpDesc.scala @@ -9,8 +9,8 @@ import edu.uci.ics.amber.core.workflow.{PhysicalOp, RangePartition} import edu.uci.ics.amber.operator.LogicalOp import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} @JsonSchemaInject(json = """ { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/reddit/RedditSearchSourceOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/reddit/RedditSearchSourceOpDesc.scala index b42dc307ac6..bf2c9336d83 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/reddit/RedditSearchSourceOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/reddit/RedditSearchSourceOpDesc.scala @@ -5,7 +5,7 @@ import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.source.PythonSourceOperatorDescriptor -import edu.uci.ics.amber.workflow.OutputPort +import edu.uci.ics.amber.core.workflow.OutputPort class RedditSearchSourceOpDesc extends PythonSourceOperatorDescriptor { @JsonProperty(required = true) diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/TwitterSourceOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/TwitterSourceOpDesc.scala index be6674e0bb3..79ddc0f3933 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/TwitterSourceOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/TwitterSourceOpDesc.scala @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaDescription, JsonSchemaTitle} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.source.SourceOperatorDescriptor -import edu.uci.ics.amber.workflow.OutputPort +import edu.uci.ics.amber.core.workflow.OutputPort abstract class TwitterSourceOpDesc extends SourceOperatorDescriptor { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala index 6b637431c66..5b17a08d23a 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala @@ -11,7 +11,7 @@ import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.operator.metadata.annotations.UIWidget import edu.uci.ics.amber.operator.source.apis.twitter.TwitterSourceOpDesc -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} class TwitterFullArchiveSearchSourceOpDesc extends TwitterSourceOpDesc { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala index aecea184a3c..39d5bd697bb 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala @@ -11,7 +11,7 @@ import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.operator.metadata.annotations.UIWidget import edu.uci.ics.amber.operator.source.apis.twitter.TwitterSourceOpDesc -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} class TwitterSearchSourceOpDesc extends TwitterSourceOpDesc { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/cache/CacheSourceOpExec.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/cache/CacheSourceOpExec.scala index ba335d1d5c9..f8dac9d938f 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/cache/CacheSourceOpExec.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/cache/CacheSourceOpExec.scala @@ -4,7 +4,7 @@ import com.typesafe.scalalogging.LazyLogging import edu.uci.ics.amber.core.executor.SourceOperatorExecutor import edu.uci.ics.amber.core.storage.result.ResultStorage import edu.uci.ics.amber.core.tuple.TupleLike -import edu.uci.ics.amber.virtualidentity.WorkflowIdentity +import edu.uci.ics.amber.core.virtualidentity.WorkflowIdentity class CacheSourceOpExec(storageKey: String, workflowIdentity: WorkflowIdentity) extends SourceOperatorExecutor diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/fetcher/URLFetcherOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/fetcher/URLFetcherOpDesc.scala index 458a6f50c9b..38ce1e997e0 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/fetcher/URLFetcherOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/fetcher/URLFetcherOpDesc.scala @@ -7,8 +7,8 @@ import edu.uci.ics.amber.core.tuple.{AttributeType, Schema} import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.source.SourceOperatorDescriptor -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.OutputPort +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.OutputPort class URLFetcherOpDesc extends SourceOperatorDescriptor { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/FileScanSourceOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/FileScanSourceOpDesc.scala index 15a7559af7f..5902e0e030c 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/FileScanSourceOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/FileScanSourceOpDesc.scala @@ -11,7 +11,7 @@ import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.operator.metadata.annotations.HideAnnotation import edu.uci.ics.amber.operator.source.scan.text.TextSourceOpDesc -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} @JsonIgnoreProperties(value = Array("limit", "offset", "fileEncoding")) class FileScanSourceOpDesc extends ScanSourceOpDesc with TextSourceOpDesc { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/ScanSourceOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/ScanSourceOpDesc.scala index 80aee74cf63..919c35f6cb4 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/ScanSourceOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/ScanSourceOpDesc.scala @@ -6,7 +6,7 @@ import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.core.tuple.Schema import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.source.SourceOperatorDescriptor -import edu.uci.ics.amber.workflow.OutputPort +import edu.uci.ics.amber.core.workflow.OutputPort import org.apache.commons.lang3.builder.EqualsBuilder import java.net.URI diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/arrow/ArrowSourceOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/arrow/ArrowSourceOpDesc.scala index f88125ebaeb..96f48fdb75d 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/arrow/ArrowSourceOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/arrow/ArrowSourceOpDesc.scala @@ -6,7 +6,7 @@ import edu.uci.ics.amber.core.storage.DocumentFactory import edu.uci.ics.amber.core.tuple.Schema import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.operator.source.scan.ScanSourceOpDesc -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.util.ArrowUtils import java.io.IOException diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csv/CSVScanSourceOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csv/CSVScanSourceOpDesc.scala index 26bc17e77de..6d9fc7a5d22 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csv/CSVScanSourceOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csv/CSVScanSourceOpDesc.scala @@ -10,7 +10,7 @@ import edu.uci.ics.amber.core.tuple.AttributeTypeUtils.inferSchemaFromRows import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.operator.source.scan.ScanSourceOpDesc -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import java.io.{IOException, InputStreamReader} import java.net.URI diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csv/ParallelCSVScanSourceOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csv/ParallelCSVScanSourceOpDesc.scala index 2337d60624a..eb50cbe0910 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csv/ParallelCSVScanSourceOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csv/ParallelCSVScanSourceOpDesc.scala @@ -9,7 +9,7 @@ import edu.uci.ics.amber.core.storage.DocumentFactory import edu.uci.ics.amber.core.tuple.AttributeTypeUtils.inferSchemaFromRows import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.operator.source.scan.ScanSourceOpDesc import java.io.IOException diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csvOld/CSVOldScanSourceOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csvOld/CSVOldScanSourceOpDesc.scala index dda17c65985..f3b2ea1f2e6 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csvOld/CSVOldScanSourceOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/csvOld/CSVOldScanSourceOpDesc.scala @@ -9,7 +9,7 @@ import edu.uci.ics.amber.core.storage.DocumentFactory import edu.uci.ics.amber.core.tuple.AttributeTypeUtils.inferSchemaFromRows import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.operator.source.scan.ScanSourceOpDesc import java.io.IOException diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/json/JSONLScanSourceOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/json/JSONLScanSourceOpDesc.scala index ec540537829..0be43a62c39 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/json/JSONLScanSourceOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/json/JSONLScanSourceOpDesc.scala @@ -10,7 +10,7 @@ import edu.uci.ics.amber.core.tuple.{Attribute, Schema} import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.operator.source.scan.ScanSourceOpDesc import edu.uci.ics.amber.util.JSONUtils.{JSONToMap, objectMapper} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import java.io._ import java.net.URI diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/text/TextInputSourceOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/text/TextInputSourceOpDesc.scala index e4857a28e57..e3aaec7da42 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/text/TextInputSourceOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/scan/text/TextInputSourceOpDesc.scala @@ -8,8 +8,8 @@ import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.UIWidget import edu.uci.ics.amber.operator.source.SourceOperatorDescriptor -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.OutputPort +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.OutputPort class TextInputSourceOpDesc extends SourceOperatorDescriptor with TextSourceOpDesc { @JsonProperty(required = true) diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/asterixdb/AsterixDBSourceOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/asterixdb/AsterixDBSourceOpDesc.scala index bc1f8a86e21..8ab3249d909 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/asterixdb/AsterixDBSourceOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/asterixdb/AsterixDBSourceOpDesc.scala @@ -17,8 +17,8 @@ import edu.uci.ics.amber.operator.metadata.annotations.{ AutofillAttributeNameList, UIWidget } -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.OutputPort +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.OutputPort import edu.uci.ics.amber.operator.source.sql.SQLSourceOpDesc import edu.uci.ics.amber.operator.source.sql.asterixdb.AsterixDBConnUtil.{ fetchDataTypeFields, diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/mysql/MySQLSourceOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/mysql/MySQLSourceOpDesc.scala index b6ebd899491..073e900e658 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/mysql/MySQLSourceOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/mysql/MySQLSourceOpDesc.scala @@ -5,8 +5,8 @@ import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.source.sql.SQLSourceOpDesc import edu.uci.ics.amber.operator.source.sql.mysql.MySQLConnUtil.connect -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.OutputPort +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.OutputPort import java.sql.{Connection, SQLException} diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/postgresql/PostgreSQLSourceOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/postgresql/PostgreSQLSourceOpDesc.scala index 0a7c10193e6..4abc00c2c6b 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/postgresql/PostgreSQLSourceOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/source/sql/postgresql/PostgreSQLSourceOpDesc.scala @@ -9,8 +9,8 @@ import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo import edu.uci.ics.amber.operator.metadata.annotations.UIWidget import edu.uci.ics.amber.operator.source.sql.SQLSourceOpDesc import edu.uci.ics.amber.operator.source.sql.postgresql.PostgreSQLConnUtil.connect -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.OutputPort +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.OutputPort import java.sql.{Connection, SQLException} diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/split/SplitOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/split/SplitOpDesc.scala index 1c2b3b80b09..1aab480e7d5 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/split/SplitOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/split/SplitOpDesc.scala @@ -7,8 +7,8 @@ import edu.uci.ics.amber.core.tuple.Schema import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.operator.LogicalOp import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort, PortIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity} import scala.util.Random class SplitOpDesc extends LogicalOp { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/split/SplitOpExec.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/split/SplitOpExec.scala index 3790faf3ba5..848982a1e20 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/split/SplitOpExec.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/split/SplitOpExec.scala @@ -2,7 +2,7 @@ package edu.uci.ics.amber.operator.split import edu.uci.ics.amber.core.executor.OperatorExecutor import edu.uci.ics.amber.core.tuple.{Tuple, TupleLike} -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity import scala.util.Random diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/symmetricDifference/SymmetricDifferenceOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/symmetricDifference/SymmetricDifferenceOpDesc.scala index 8f6a8161bbf..94a2ac3b852 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/symmetricDifference/SymmetricDifferenceOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/symmetricDifference/SymmetricDifferenceOpDesc.scala @@ -6,8 +6,8 @@ import edu.uci.ics.amber.core.tuple.Schema import edu.uci.ics.amber.core.workflow.{HashPartition, PhysicalOp} import edu.uci.ics.amber.operator.LogicalOp import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort, PortIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity} class SymmetricDifferenceOpDesc extends LogicalOp { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/typecasting/TypeCastingOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/typecasting/TypeCastingOpDesc.scala index 91741b73d05..eca814f491c 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/typecasting/TypeCastingOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/typecasting/TypeCastingOpDesc.scala @@ -7,8 +7,8 @@ import edu.uci.ics.amber.core.tuple.{AttributeTypeUtils, Schema} import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.operator.map.MapOpDesc import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort, PortIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity} class TypeCastingOpDesc extends MapOpDesc { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/java/JavaUDFOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/java/JavaUDFOpDesc.scala index baa2974723c..a3fa40a4e01 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/java/JavaUDFOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/java/JavaUDFOpDesc.scala @@ -13,8 +13,8 @@ import edu.uci.ics.amber.core.workflow.{ } import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.{LogicalOp, PortDescription, StateTransferFunc} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort, PortIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity} import scala.util.{Success, Try} class JavaUDFOpDesc extends LogicalOp { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/DualInputPortsPythonUDFOpDescV2.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/DualInputPortsPythonUDFOpDescV2.scala index 3f10db09099..24d6bb62549 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/DualInputPortsPythonUDFOpDescV2.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/DualInputPortsPythonUDFOpDescV2.scala @@ -8,8 +8,8 @@ import edu.uci.ics.amber.core.tuple.{Attribute, Schema} import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc, UnknownPartition} import edu.uci.ics.amber.operator.LogicalOp import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort, PortIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity} class DualInputPortsPythonUDFOpDescV2 extends LogicalOp { @JsonProperty( diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/PythonLambdaFunctionOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/PythonLambdaFunctionOpDesc.scala index 22d787cad24..aa016c2740e 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/PythonLambdaFunctionOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/PythonLambdaFunctionOpDesc.scala @@ -5,7 +5,7 @@ import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.core.tuple.{AttributeTypeUtils, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} class PythonLambdaFunctionOpDesc extends PythonOperatorDescriptor { @JsonSchemaTitle("Add/Modify column(s)") diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/PythonTableReducerOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/PythonTableReducerOpDesc.scala index 4e533940b0e..aa36eaced06 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/PythonTableReducerOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/PythonTableReducerOpDesc.scala @@ -5,7 +5,7 @@ import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.core.tuple.Schema import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} class PythonTableReducerOpDesc extends PythonOperatorDescriptor { @JsonSchemaTitle("Output columns") diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/PythonUDFOpDescV2.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/PythonUDFOpDescV2.scala index e9f42ec6c51..3ce08b1510a 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/PythonUDFOpDescV2.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/PythonUDFOpDescV2.scala @@ -13,8 +13,8 @@ import edu.uci.ics.amber.core.workflow.{ } import edu.uci.ics.amber.operator.{LogicalOp, PortDescription, StateTransferFunc} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort, PortIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity} import scala.util.{Success, Try} diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/source/PythonUDFSourceOpDescV2.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/source/PythonUDFSourceOpDescV2.scala index 91642ec8b3e..3086d8e6762 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/source/PythonUDFSourceOpDescV2.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/python/source/PythonUDFSourceOpDescV2.scala @@ -7,8 +7,8 @@ import edu.uci.ics.amber.core.tuple.{Attribute, Schema} import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.source.SourceOperatorDescriptor -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{OutputPort, PortIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{OutputPort, PortIdentity} class PythonUDFSourceOpDescV2 extends SourceOperatorDescriptor { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/r/RUDFOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/r/RUDFOpDesc.scala index 0489645ca6d..94f31d02f05 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/r/RUDFOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/r/RUDFOpDesc.scala @@ -13,8 +13,8 @@ import edu.uci.ics.amber.core.workflow.{ } import edu.uci.ics.amber.operator.{LogicalOp, PortDescription, StateTransferFunc} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort, PortIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity} import scala.util.{Success, Try} diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/r/RUDFSourceOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/r/RUDFSourceOpDesc.scala index 7dd22c92436..afb2e2524e4 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/r/RUDFSourceOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/udf/r/RUDFSourceOpDesc.scala @@ -7,8 +7,8 @@ import edu.uci.ics.amber.core.tuple.{Attribute, Schema} import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.source.SourceOperatorDescriptor -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{OutputPort, PortIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{OutputPort, PortIdentity} class RUDFSourceOpDesc extends SourceOperatorDescriptor { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/union/UnionOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/union/UnionOpDesc.scala index 617a0ca1264..6e6efcc1d0c 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/union/UnionOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/union/UnionOpDesc.scala @@ -6,8 +6,8 @@ import edu.uci.ics.amber.core.tuple.Schema import edu.uci.ics.amber.core.workflow.PhysicalOp import edu.uci.ics.amber.operator.LogicalOp import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort, PortIdentity} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort, PortIdentity} class UnionOpDesc extends LogicalOp { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/unneststring/UnnestStringOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/unneststring/UnnestStringOpDesc.scala index abf033f4d1b..26b36b410dc 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/unneststring/UnnestStringOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/unneststring/UnnestStringOpDesc.scala @@ -8,8 +8,8 @@ import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.operator.flatmap.FlatMapOpDesc import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} class UnnestStringOpDesc extends FlatMapOpDesc { @JsonProperty(value = "Delimiter", required = true, defaultValue = ",") diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/DotPlot/DotPlotOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/DotPlot/DotPlotOpDesc.scala index 5cf03a51a6c..c6e6a46d34a 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/DotPlot/DotPlotOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/DotPlot/DotPlotOpDesc.scala @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/IcicleChart/IcicleChartOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/IcicleChart/IcicleChartOpDesc.scala index bad227b992e..7034e9f6bb9 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/IcicleChart/IcicleChartOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/IcicleChart/IcicleChartOpDesc.scala @@ -7,8 +7,8 @@ import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName import edu.uci.ics.amber.operator.visualization.hierarchychart.HierarchySection -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} // type constraint: value can only be numeric @JsonSchemaInject(json = """ diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ImageViz/ImageVisualizerOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ImageViz/ImageVisualizerOpDesc.scala index cbb10911101..a1389c426d8 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ImageViz/ImageVisualizerOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ImageViz/ImageVisualizerOpDesc.scala @@ -3,8 +3,8 @@ package edu.uci.ics.amber.operator.visualization.ImageViz import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName import edu.uci.ics.amber.operator.PythonOperatorDescriptor diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ScatterMatrixChart/ScatterMatrixChartOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ScatterMatrixChart/ScatterMatrixChartOpDesc.scala index 8e928f877bb..ea84feee197 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ScatterMatrixChart/ScatterMatrixChartOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ScatterMatrixChart/ScatterMatrixChartOpDesc.scala @@ -3,14 +3,14 @@ package edu.uci.ics.amber.operator.visualization.ScatterMatrixChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.{ AutofillAttributeName, AutofillAttributeNameList } import edu.uci.ics.amber.operator.PythonOperatorDescriptor -import edu.uci.ics.amber.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode @JsonSchemaInject(json = """ { "attributeTypeRules": { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/barChart/BarChartOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/barChart/BarChartOpDesc.scala index 64e5d6f8a60..e3a8705cab0 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/barChart/BarChartOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/barChart/BarChartOpDesc.scala @@ -6,8 +6,8 @@ import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} //type constraint: value can only be numeric @JsonSchemaInject(json = """ diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/boxPlot/BoxPlotOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/boxPlot/BoxPlotOpDesc.scala index 7e48e5cd43e..064992b96d5 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/boxPlot/BoxPlotOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/boxPlot/BoxPlotOpDesc.scala @@ -3,8 +3,8 @@ package edu.uci.ics.amber.operator.visualization.boxPlot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName import edu.uci.ics.amber.operator.PythonOperatorDescriptor diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/bubbleChart/BubbleChartOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/bubbleChart/BubbleChartOpDesc.scala index 58c1a916e0e..aa589a33c24 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/bubbleChart/BubbleChartOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/bubbleChart/BubbleChartOpDesc.scala @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/candlestickChart/CandlestickChartOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/candlestickChart/CandlestickChartOpDesc.scala index 39085aa76e1..a344e3fb6d6 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/candlestickChart/CandlestickChartOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/candlestickChart/CandlestickChartOpDesc.scala @@ -6,8 +6,8 @@ import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} class CandlestickChartOpDesc extends PythonOperatorDescriptor { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/continuousErrorBands/ContinuousErrorBandsOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/continuousErrorBands/ContinuousErrorBandsOpDesc.scala index 189d238ee3b..e81d1d87f78 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/continuousErrorBands/ContinuousErrorBandsOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/continuousErrorBands/ContinuousErrorBandsOpDesc.scala @@ -5,8 +5,8 @@ import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import java.util import scala.jdk.CollectionConverters.ListHasAsScala diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/contourPlot/ContourPlotOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/contourPlot/ContourPlotOpDesc.scala index 86854f41685..14001e6d3ec 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/contourPlot/ContourPlotOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/contourPlot/ContourPlotOpDesc.scala @@ -6,8 +6,8 @@ import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} class ContourPlotOpDesc extends PythonOperatorDescriptor { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/dumbbellPlot/DumbbellPlotOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/dumbbellPlot/DumbbellPlotOpDesc.scala index 340e9768bec..eb933ce627d 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/dumbbellPlot/DumbbellPlotOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/dumbbellPlot/DumbbellPlotOpDesc.scala @@ -3,8 +3,8 @@ package edu.uci.ics.amber.operator.visualization.dumbbellPlot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/figureFactoryTable/FigureFactoryTableOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/figureFactoryTable/FigureFactoryTableOpDesc.scala index 862fe472b32..6c3d93b6f2e 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/figureFactoryTable/FigureFactoryTableOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/figureFactoryTable/FigureFactoryTableOpDesc.scala @@ -5,8 +5,8 @@ import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} class FigureFactoryTableOpDesc extends PythonOperatorDescriptor { @JsonProperty(required = false) diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDesc.scala index bb85ae82741..106f424bbc1 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/filledAreaPlot/FilledAreaPlotOpDesc.scala @@ -4,10 +4,10 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName -import edu.uci.ics.amber.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode class FilledAreaPlotOpDesc extends PythonOperatorDescriptor { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/funnelPlot/FunnelPlotOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/funnelPlot/FunnelPlotOpDesc.scala index 91c75660045..c9a32bc8044 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/funnelPlot/FunnelPlotOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/funnelPlot/FunnelPlotOpDesc.scala @@ -6,8 +6,8 @@ import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} @JsonSchemaInject(json = """ { "attributeTypeRules": { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ganttChart/GanttChartOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ganttChart/GanttChartOpDesc.scala index d130a8db7cf..2a34113e9fb 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ganttChart/GanttChartOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ganttChart/GanttChartOpDesc.scala @@ -4,10 +4,10 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName -import edu.uci.ics.amber.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode @JsonSchemaInject(json = """ { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/heatMap/HeatMapOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/heatMap/HeatMapOpDesc.scala index 8f5837affa3..8c11038d25e 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/heatMap/HeatMapOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/heatMap/HeatMapOpDesc.scala @@ -6,8 +6,8 @@ import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} class HeatMapOpDesc extends PythonOperatorDescriptor { @JsonProperty(value = "x", required = true) diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/hierarchychart/HierarchyChartOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/hierarchychart/HierarchyChartOpDesc.scala index 33d61e637e8..b23f7b511c2 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/hierarchychart/HierarchyChartOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/hierarchychart/HierarchyChartOpDesc.scala @@ -6,8 +6,8 @@ import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import edu.uci.ics.amber.operator.PythonOperatorDescriptor // type constraint: value can only be numeric @JsonSchemaInject(json = """ diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/histogram/HistogramChartOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/histogram/HistogramChartOpDesc.scala index b1470a9e23e..044dad14065 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/histogram/HistogramChartOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/histogram/HistogramChartOpDesc.scala @@ -3,8 +3,8 @@ package edu.uci.ics.amber.operator.visualization.histogram import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName import edu.uci.ics.amber.operator.PythonOperatorDescriptor diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/htmlviz/HtmlVizOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/htmlviz/HtmlVizOpDesc.scala index 9ff91b96bdd..5f2696c3cb9 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/htmlviz/HtmlVizOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/htmlviz/HtmlVizOpDesc.scala @@ -8,9 +8,9 @@ import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.operator.LogicalOp import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} /** * HTML Visualization operator to render any given HTML code diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/lineChart/LineChartOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/lineChart/LineChartOpDesc.scala index 742ede861cd..e7deebe579d 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/lineChart/LineChartOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/lineChart/LineChartOpDesc.scala @@ -5,8 +5,8 @@ import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import java.util import scala.jdk.CollectionConverters.ListHasAsScala diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/pieChart/PieChartOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/pieChart/PieChartOpDesc.scala index 133e6763781..923ca5a619a 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/pieChart/PieChartOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/pieChart/PieChartOpDesc.scala @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/quiverPlot/QuiverPlotOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/quiverPlot/QuiverPlotOpDesc.scala index 8cff995fa83..054d02b8090 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/quiverPlot/QuiverPlotOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/quiverPlot/QuiverPlotOpDesc.scala @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/sankeyDiagram/SankeyDiagramOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/sankeyDiagram/SankeyDiagramOpDesc.scala index 3728bb55309..f00c164743b 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/sankeyDiagram/SankeyDiagramOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/sankeyDiagram/SankeyDiagramOpDesc.scala @@ -6,8 +6,8 @@ import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} class SankeyDiagramOpDesc extends PythonOperatorDescriptor { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/scatter3DChart/Scatter3dChartOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/scatter3DChart/Scatter3dChartOpDesc.scala index aaba3fff092..d0e71870398 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/scatter3DChart/Scatter3dChartOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/scatter3DChart/Scatter3dChartOpDesc.scala @@ -3,11 +3,11 @@ package edu.uci.ics.amber.operator.visualization.scatter3DChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName import edu.uci.ics.amber.operator.PythonOperatorDescriptor -import edu.uci.ics.amber.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode @JsonSchemaInject(json = """ { "attributeTypeRules": { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/scatterplot/ScatterplotOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/scatterplot/ScatterplotOpDesc.scala index 8f522388109..8195441602b 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/scatterplot/ScatterplotOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/scatterplot/ScatterplotOpDesc.scala @@ -4,10 +4,10 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName -import edu.uci.ics.amber.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode @JsonSchemaInject( json = diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/tablesChart/TablesPlotOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/tablesChart/TablesPlotOpDesc.scala index 648d4355b85..941d681a6ed 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/tablesChart/TablesPlotOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/tablesChart/TablesPlotOpDesc.scala @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} class TablesPlotOpDesc extends PythonOperatorDescriptor { @JsonPropertyDescription("List of columns to include in the table chart") diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ternaryPlot/TernaryPlotOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ternaryPlot/TernaryPlotOpDesc.scala index 9f8059843c4..91db1d5e1b2 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ternaryPlot/TernaryPlotOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/ternaryPlot/TernaryPlotOpDesc.scala @@ -6,8 +6,8 @@ import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} /** * Visualization Operator for Ternary Plots. diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/urlviz/UrlVizOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/urlviz/UrlVizOpDesc.scala index db9fa71c891..7fe381c2d28 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/urlviz/UrlVizOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/urlviz/UrlVizOpDesc.scala @@ -6,11 +6,11 @@ import edu.uci.ics.amber.core.executor.OpExecInitInfo import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.core.workflow.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.operator.LogicalOp -import edu.uci.ics.amber.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.virtualidentity.{ExecutionIdentity, WorkflowIdentity} +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName -import edu.uci.ics.amber.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode /** * URL Visualization operator to render any content in given URL link diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/waterfallChart/WaterfallChartOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/waterfallChart/WaterfallChartOpDesc.scala index 236078d6e9b..15bee2d2506 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/waterfallChart/WaterfallChartOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/waterfallChart/WaterfallChartOpDesc.scala @@ -6,8 +6,8 @@ import edu.uci.ics.amber.core.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} class WaterfallChartOpDesc extends PythonOperatorDescriptor { diff --git a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/wordCloud/WordCloudOpDesc.scala b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/wordCloud/WordCloudOpDesc.scala index 9659504c5fe..516bc3ab3b4 100644 --- a/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/wordCloud/WordCloudOpDesc.scala +++ b/core/workflow-operator/src/main/scala/edu/uci/ics/amber/operator/visualization/wordCloud/WordCloudOpDesc.scala @@ -11,8 +11,8 @@ import edu.uci.ics.amber.operator.PythonOperatorDescriptor import edu.uci.ics.amber.operator.metadata.annotations.AutofillAttributeName import edu.uci.ics.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.amber.operator.visualization.ImageUtility -import edu.uci.ics.amber.workflow.OutputPort.OutputMode -import edu.uci.ics.amber.workflow.{InputPort, OutputPort} +import edu.uci.ics.amber.core.workflow.OutputPort.OutputMode +import edu.uci.ics.amber.core.workflow.{InputPort, OutputPort} class WordCloudOpDesc extends PythonOperatorDescriptor { @JsonProperty(required = true) @JsonSchemaTitle("Text column") diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/intersect/IntersectOpExecSpec.scala b/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/intersect/IntersectOpExecSpec.scala index f0903bdeaf0..03c10c310b6 100644 --- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/intersect/IntersectOpExecSpec.scala +++ b/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/intersect/IntersectOpExecSpec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.amber.operator.intersect -import edu.uci.ics.amber.virtualidentity.{OperatorIdentity, PhysicalOpIdentity} -import edu.uci.ics.amber.workflow.{PhysicalLink, PortIdentity} +import edu.uci.ics.amber.core.virtualidentity.{OperatorIdentity, PhysicalOpIdentity} +import edu.uci.ics.amber.core.workflow.{PhysicalLink, PortIdentity} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/intervalJoin/IntervalOpExecSpec.scala b/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/intervalJoin/IntervalOpExecSpec.scala index 501fbe8a1ab..c21d2308791 100644 --- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/intervalJoin/IntervalOpExecSpec.scala +++ b/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/intervalJoin/IntervalOpExecSpec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.amber.operator.intervalJoin -import edu.uci.ics.amber.virtualidentity.{OperatorIdentity, PhysicalOpIdentity} -import edu.uci.ics.amber.workflow.{PhysicalLink, PortIdentity} +import edu.uci.ics.amber.core.virtualidentity.{OperatorIdentity, PhysicalOpIdentity} +import edu.uci.ics.amber.core.workflow.{PhysicalLink, PortIdentity} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/source/scan/csv/CSVScanSourceOpDescSpec.scala b/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/source/scan/csv/CSVScanSourceOpDescSpec.scala index 06dd412b8b9..cb9d031952b 100644 --- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/source/scan/csv/CSVScanSourceOpDescSpec.scala +++ b/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/source/scan/csv/CSVScanSourceOpDescSpec.scala @@ -4,7 +4,7 @@ import edu.uci.ics.amber.core.storage.FileResolver import edu.uci.ics.amber.core.tuple.{AttributeType, Schema} import edu.uci.ics.amber.core.workflow.WorkflowContext.{DEFAULT_EXECUTION_ID, DEFAULT_WORKFLOW_ID} import edu.uci.ics.amber.operator.TestOperators -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/unneststring/UnnestStringOpExecSpec.scala b/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/unneststring/UnnestStringOpExecSpec.scala index 48620b56717..96cfb08acde 100644 --- a/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/unneststring/UnnestStringOpExecSpec.scala +++ b/core/workflow-operator/src/test/scala/edu/uci/ics/amber/operator/unneststring/UnnestStringOpExecSpec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.amber.operator.unneststring import edu.uci.ics.amber.core.tuple._ -import edu.uci.ics.amber.workflow.PortIdentity +import edu.uci.ics.amber.core.workflow.PortIdentity import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec class UnnestStringOpExecSpec extends AnyFlatSpec with BeforeAndAfter {