From 60198ba44858850c79794c3136b7903d55c8ab16 Mon Sep 17 00:00:00 2001 From: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com> Date: Tue, 8 Oct 2024 16:00:21 -0700 Subject: [PATCH 1/7] move tuple into amber --- .../controller/ControllerEvent.scala | 2 +- .../promisehandlers/PauseHandler.scala | 2 +- .../deploysemantics/PhysicalOp.scala | 2 +- .../messaginglayer/InputManager.scala | 3 +- .../messaginglayer/OutputManager.scala | 8 +-- .../messaginglayer/WorkerPort.scala | 2 +- .../pythonworker/ArrowUtils.scala | 10 +-- .../pythonworker/PythonProxyClient.scala | 5 +- .../pythonworker/PythonProxyServer.scala | 2 +- .../partitioners/BroadcastPartitioner.scala | 2 +- .../HashBasedShufflePartitioner.scala | 2 +- .../partitioners/OneToOnePartitioner.scala | 2 +- .../partitioners/Partitioner.scala | 2 +- .../RangeBasedShufflePartitioner.scala | 3 +- .../partitioners/RoundRobinPartitioner.scala | 2 +- .../architecture/worker/DataProcessor.scala | 8 +-- .../architecture/worker/WorkerResult.scala | 2 +- .../managers/SerializationManager.scala | 2 +- .../promisehandlers/AssignPortHandler.scala | 2 +- .../QueryCurrentInputTupleHandler.scala | 2 +- .../engine/common/CheckpointSupport.scala | 2 +- .../engine/common/SinkOperatorExecutor.scala | 3 +- .../common/SourceOperatorExecutor.scala | 3 +- .../common/ambermessage/DataPayload.scala | 2 +- .../engine/common/model/tuple}/Attribute.java | 2 +- .../common/model/tuple}/AttributeType.java | 2 +- .../model/tuple}/AttributeTypeUtils.scala | 64 ++++++++--------- .../engine/common/model/tuple}/Schema.scala | 2 +- .../engine/common/model}/tuple/Tuple.scala | 13 ++-- .../amber => model/tuple}/TupleLike.scala | 4 +- .../common/model}/tuple/TupleUtils.scala | 10 +-- .../response/SchemaPropagationResponse.scala | 2 +- .../WorkflowCompilationResource.scala | 2 +- .../user/dataset/DatasetResource.scala | 70 +++---------------- .../web/service/ExecutionResultService.scala | 2 +- .../web/service/ResultExportService.scala | 2 +- .../ics/texera/workflow/common/Marker.scala | 3 +- .../workflow/common/ProgressiveUtils.scala | 3 +- .../workflow/common/operators/LogicalOp.scala | 2 +- .../common/operators/OperatorExecutor.scala | 3 +- .../operators/filter/FilterOpDesc.scala | 2 +- .../operators/filter/FilterOpExec.scala | 3 +- .../operators/flatmap/FlatMapOpExec.scala | 3 +- .../common/operators/map/MapOpExec.scala | 3 +- .../source/SourceOperatorDescriptor.scala | 2 +- .../exception/TupleBuildingException.java | 8 --- .../common/workflow/LogicalPlan.scala | 2 +- .../common/workflow/WorkflowCompiler.scala | 2 +- .../operators/aggregate/AggregateOpDesc.scala | 2 +- .../operators/aggregate/AggregateOpExec.scala | 3 +- .../aggregate/AggregationOperation.scala | 5 +- .../aggregate/DistributedAggregation.scala | 2 +- .../CartesianProductOpDesc.scala | 2 +- .../CartesianProductOpExec.scala | 3 +- .../dictionary/DictionaryMatcherOpDesc.scala | 2 +- .../dictionary/DictionaryMatcherOpExec.scala | 3 +- .../difference/DifferenceOpDesc.scala | 2 +- .../difference/DifferenceOpExec.scala | 3 +- .../operators/distinct/DistinctOpDesc.scala | 2 +- .../operators/distinct/DistinctOpExec.scala | 3 +- .../download/BulkDownloaderOpDesc.scala | 2 +- .../download/BulkDownloaderOpExec.scala | 3 +- .../operators/dummy/DummyOpDesc.scala | 2 +- .../operators/filter/FilterPredicate.java | 7 +- .../filter/SpecializedFilterOpExec.java | 2 +- .../hashJoin/HashJoinBuildOpExec.scala | 3 +- .../operators/hashJoin/HashJoinOpDesc.scala | 2 +- .../hashJoin/HashJoinProbeOpExec.scala | 3 +- ...gingFaceIrisLogisticRegressionOpDesc.scala | 2 +- .../HuggingFaceSentimentAnalysisOpDesc.scala | 2 +- .../HuggingFaceSpamSMSDetectionOpDesc.scala | 2 +- .../HuggingFaceTextSummarizationOpDesc.scala | 2 +- .../operators/intersect/IntersectOpDesc.scala | 2 +- .../operators/intersect/IntersectOpExec.scala | 3 +- .../intervalJoin/IntervalJoinOpDesc.scala | 2 +- .../intervalJoin/IntervalJoinOpExec.scala | 4 +- .../keywordSearch/KeywordSearchOpExec.scala | 2 +- .../operators/limit/LimitOpDesc.scala | 2 +- .../operators/limit/LimitOpExec.scala | 3 +- .../Scorer/MachineLearningScorerOpDesc.scala | 2 +- .../base/SklearnAdvancedBaseDesc.scala | 2 +- .../projection/ProjectionOpDesc.scala | 2 +- .../projection/ProjectionOpExec.scala | 3 +- .../operators/regex/RegexOpExec.scala | 2 +- .../ReservoirSamplingOpDesc.scala | 2 +- .../ReservoirSamplingOpExec.scala | 3 +- .../sentiment/SentimentAnalysisOpDesc.scala | 2 +- .../sentiment/SentimentAnalysisOpExec.java | 4 +- .../sink/managed/ProgressiveSinkOpDesc.java | 3 +- .../sink/managed/ProgressiveSinkOpExec.scala | 3 +- .../sink/storage/MemoryStorage.scala | 3 +- .../sink/storage/MongoDBSinkStorage.scala | 5 +- .../sink/storage/SinkStorageReader.scala | 3 +- .../sink/storage/SinkStorageWriter.scala | 2 +- .../operators/sklearn/SklearnMLOpDesc.scala | 2 +- .../sklearn/SklearnPredictionOpDesc.scala | 2 +- .../workflow/operators/sort/SortOpDesc.scala | 2 +- .../sortPartitions/SortPartitionOpExec.scala | 4 +- .../sortPartitions/SortPartitionsOpDesc.scala | 2 +- .../reddit/RedditSearchSourceOpDesc.scala | 4 +- ...TwitterFullArchiveSearchSourceOpDesc.scala | 2 +- ...TwitterFullArchiveSearchSourceOpExec.scala | 4 +- .../v2/TwitterSearchSourceOpDesc.scala | 2 +- .../v2/TwitterSearchSourceOpExec.scala | 4 +- .../source/apis/twitter/v2/TwitterUtils.scala | 3 +- .../source/cache/CacheSourceOpDesc.scala | 2 +- .../source/cache/CacheSourceOpExec.scala | 2 +- .../source/fetcher/URLFetcherOpDesc.scala | 2 +- .../source/fetcher/URLFetcherOpExec.scala | 2 +- .../source/scan/FileAttributeType.java | 2 +- .../source/scan/FileScanSourceOpDesc.scala | 2 +- .../source/scan/FileScanSourceOpExec.scala | 4 +- .../source/scan/ScanSourceOpDesc.scala | 2 +- .../source/scan/csv/CSVScanSourceOpDesc.scala | 4 +- .../source/scan/csv/CSVScanSourceOpExec.scala | 3 +- .../csv/ParallelCSVScanSourceOpDesc.scala | 4 +- .../csv/ParallelCSVScanSourceOpExec.scala | 3 +- .../scan/csvOld/CSVOldScanSourceOpDesc.scala | 4 +- .../scan/csvOld/CSVOldScanSourceOpExec.scala | 3 +- .../scan/json/JSONLScanSourceOpDesc.scala | 4 +- .../scan/json/JSONLScanSourceOpExec.scala | 5 +- .../scan/text/TextInputSourceOpDesc.scala | 2 +- .../scan/text/TextInputSourceOpExec.scala | 4 +- .../source/sql/SQLSourceOpDesc.scala | 2 +- .../source/sql/SQLSourceOpExec.scala | 7 +- .../sql/asterixdb/AsterixDBSourceOpDesc.scala | 2 +- .../sql/asterixdb/AsterixDBSourceOpExec.scala | 7 +- .../source/sql/mysql/MySQLSourceOpExec.scala | 2 +- .../postgresql/PostgreSQLSourceOpExec.scala | 2 +- .../operators/split/SplitOpDesc.scala | 2 +- .../operators/split/SplitOpExec.scala | 3 +- .../SymmetricDifferenceOpDesc.scala | 2 +- .../SymmetricDifferenceOpExec.scala | 3 +- .../typecasting/TypeCastingOpDesc.java | 6 +- .../typecasting/TypeCastingOpExec.scala | 4 +- .../typecasting/TypeCastingUnit.java | 2 +- .../operators/udf/java/JavaUDFOpDesc.scala | 2 +- .../DualInputPortsPythonUDFOpDescV2.scala | 2 +- .../udf/python/LambdaAttributeUnit.java | 2 +- .../python/PythonLambdaFunctionOpDesc.scala | 2 +- .../udf/python/PythonTableReducerOpDesc.scala | 2 +- .../udf/python/PythonUDFOpDescV2.scala | 2 +- .../source/PythonUDFSourceOpDescV2.java | 5 +- .../workflow/operators/udf/r/RUDFOpDesc.scala | 2 +- .../operators/udf/r/RUDFSourceOpDesc.java | 5 +- .../operators/union/UnionOpDesc.scala | 2 +- .../operators/union/UnionOpExec.scala | 3 +- .../unneststring/UnnestStringOpDesc.scala | 2 +- .../unneststring/UnnestStringOpExec.scala | 3 +- .../visualization/DotPlot/DotPlotOpDesc.scala | 2 +- .../IcicleChart/IcicleChartOpDesc.scala | 2 +- .../ImageViz/ImageVisualizerOpDesc.scala | 2 +- .../ScatterMatrixChartOpDesc.scala | 2 +- .../barChart/BarChartOpDesc.scala | 2 +- .../visualization/boxPlot/BoxPlotOpDesc.scala | 2 +- .../bubbleChart/BubbleChartOpDesc.scala | 2 +- .../CandlestickChartOpDesc.scala | 2 +- .../ContinuousErrorBandsOpDesc.scala | 2 +- .../contourPlot/ContourPlotOpDesc.scala | 2 +- .../dumbbellPlot/DumbbellPlotOpDesc.scala | 2 +- .../FigureFactoryTableOpDesc.scala | 2 +- .../filledAreaPlot/FilledAreaPlotOpDesc.scala | 2 +- .../funnelPlot/FunnelPlotOpDesc.scala | 2 +- .../ganttChart/GanttChartOpDesc.scala | 2 +- .../visualization/heatMap/HeatMapOpDesc.scala | 2 +- .../hierarchychart/HierarchyChartOpDesc.scala | 2 +- .../histogram/HistogramChartOpDesc.scala | 4 +- .../visualization/htmlviz/HtmlVizOpDesc.scala | 2 +- .../visualization/htmlviz/HtmlVizOpExec.scala | 3 +- .../lineChart/LineChartOpDesc.scala | 2 +- .../pieChart/PieChartOpDesc.scala | 2 +- .../quiverPlot/QuiverPlotOpDesc.scala | 2 +- .../sankeyDiagram/SankeyDiagramOpDesc.scala | 2 +- .../scatter3DChart/Scatter3dChartOpDesc.scala | 2 +- .../scatterplot/ScatterplotOpDesc.scala | 2 +- .../tablesChart/TablesPlotOpDesc.scala | 2 +- .../ternaryPlot/TernaryPlotOpDesc.scala | 2 +- .../visualization/urlviz/UrlVizOpDesc.scala | 2 +- .../visualization/urlviz/UrlVizOpExec.scala | 3 +- .../waterfallChart/WaterfallOpDesc.scala | 2 +- .../wordCloud/WordCloudOpDesc.scala | 2 +- .../NetworkInputGatewaySpec.scala | 3 +- .../messaginglayer/OutputManagerSpec.scala | 3 +- .../RangeBasedShuffleSpec.scala | 3 +- .../pythonworker/ArrowUtilsSpec.scala | 5 +- .../architecture/worker/DPThreadSpec.scala | 4 +- .../worker/DataProcessorSpec.scala | 4 +- .../architecture/worker/WorkerSpec.scala | 4 +- .../amber/engine/e2e/DataProcessingSpec.scala | 3 +- .../engine/faulttolerance/LoggingSpec.scala | 3 +- .../common/storage/MemoryDocumentSpec.scala | 3 +- .../workflow/common/tuple/TupleSpec.scala | 4 +- .../tuple/schema/AttributeTypeUtilsSpec.scala | 3 +- .../workflow/SchemaPropagationSpec.scala | 2 +- .../CartesianProductOpExecSpec.scala | 4 +- .../DictionaryMatcherOpExecSpec.scala | 4 +- .../difference/DifferenceOpExecSpec.scala | 4 +- .../distinct/DistinctOpExecSpec.scala | 4 +- .../download/BulkDownloaderOpExecSpec.scala | 3 +- .../filter/SpecializedFilterOpExecSpec.scala | 3 +- .../operators/hashJoin/HashJoinOpSpec.scala | 4 +- .../intersect/IntersectOpExecSpec.scala | 4 +- .../intervalJoin/IntervalOpExecSpec.scala | 4 +- .../projection/ProjectionOpDescSpec.scala | 2 +- .../projection/ProjectionOpExecSpec.scala | 4 +- .../SortPartitionsOpExecSpec.scala | 4 +- .../source/fetcher/URLFetcherOpExecSpec.scala | 2 +- .../scan/csv/CSVScanSourceOpDescSpec.scala | 2 +- .../scan/text/FileScanSourceOpDescSpec.scala | 4 +- .../scan/text/TextInputSourceOpDescSpec.scala | 4 +- .../SymmetricDifferenceOpExecSpec.scala | 4 +- .../typecasting/TypeCastingOpExecSpec.scala | 4 +- .../PythonLambdaFunctionOpDescSpec.scala | 2 +- .../unneststring/UnnestStringOpExecSpec.scala | 4 +- .../htmlviz/HtmlVizOpExecSpec.scala | 4 +- 215 files changed, 282 insertions(+), 476 deletions(-) rename core/amber/src/main/scala/edu/uci/ics/{texera/workflow/common/tuple/schema => amber/engine/common/model/tuple}/Attribute.java (97%) rename core/amber/src/main/scala/edu/uci/ics/{texera/workflow/common/tuple/schema => amber/engine/common/model/tuple}/AttributeType.java (98%) rename core/amber/src/main/scala/edu/uci/ics/{texera/workflow/common/tuple/schema => amber/engine/common/model/tuple}/AttributeTypeUtils.scala (86%) rename core/amber/src/main/scala/edu/uci/ics/{texera/workflow/common/tuple/schema => amber/engine/common/model/tuple}/Schema.scala (99%) rename core/amber/src/main/scala/edu/uci/ics/{texera/workflow/common => amber/engine/common/model}/tuple/Tuple.scala (95%) rename core/amber/src/main/scala/edu/uci/ics/amber/engine/common/{tuple/amber => model/tuple}/TupleLike.scala (96%) rename core/amber/src/main/scala/edu/uci/ics/{texera/workflow/common => amber/engine/common/model}/tuple/TupleUtils.scala (88%) delete mode 100644 core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/tuple/exception/TupleBuildingException.java diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerEvent.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerEvent.scala index d8a5809c6df..2af21e59fa9 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerEvent.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerEvent.scala @@ -1,9 +1,9 @@ package edu.uci.ics.amber.engine.architecture.controller +import edu.uci.ics.amber.engine.common.model.tuple.Tuple import edu.uci.ics.amber.engine.common.rpc.AsyncRPCServer.ControlCommand import edu.uci.ics.amber.engine.common.virtualidentity.ActorVirtualIdentity import edu.uci.ics.texera.web.workflowruntimestate.{OperatorMetrics, WorkflowAggregatedState} -import edu.uci.ics.texera.workflow.common.tuple.Tuple object ControllerEvent { 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 f54922eb9db..6ac1ddf749f 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 @@ -11,9 +11,9 @@ import edu.uci.ics.amber.engine.architecture.controller.ControllerAsyncRPCHandle import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.PauseHandler.PauseWorker import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.QueryCurrentInputTupleHandler.QueryCurrentInputTuple import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.QueryStatisticsHandler.QueryStatistics +import edu.uci.ics.amber.engine.common.model.tuple.Tuple import edu.uci.ics.amber.engine.common.rpc.AsyncRPCServer.ControlCommand import edu.uci.ics.amber.engine.common.virtualidentity.ActorVirtualIdentity -import edu.uci.ics.texera.workflow.common.tuple.Tuple import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/PhysicalOp.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/PhysicalOp.scala index 581e9ebcd4d..402eeeb4b99 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/PhysicalOp.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/PhysicalOp.scala @@ -25,9 +25,9 @@ import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.{ WorkerReplayInitialization } import edu.uci.ics.amber.engine.common.VirtualIdentityUtils +import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity._ import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, PhysicalLink, PortIdentity} -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema import edu.uci.ics.texera.workflow.common.workflow._ 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/messaginglayer/InputManager.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/messaginglayer/InputManager.scala index 2bb65a1954c..adfdf2812a8 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 @@ -1,10 +1,9 @@ package edu.uci.ics.amber.engine.architecture.messaginglayer import edu.uci.ics.amber.engine.common.AmberLogging +import edu.uci.ics.amber.engine.common.model.tuple.{Schema, Tuple} import edu.uci.ics.amber.engine.common.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} import edu.uci.ics.amber.engine.common.workflow.PortIdentity -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema 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 1624ada0b1d..edab82d3972 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 @@ -8,17 +8,11 @@ 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.engine.common.model.tuple.{FinalizeExecutor, FinalizePort, Schema, SchemaEnforceable, TupleLike} import edu.uci.ics.amber.engine.common.rpc.AsyncRPCServer.ControlCommand -import edu.uci.ics.amber.engine.common.tuple.amber.{ - FinalizeExecutor, - FinalizePort, - SchemaEnforceable, - TupleLike -} import edu.uci.ics.amber.engine.common.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} import edu.uci.ics.amber.engine.common.workflow.{PhysicalLink, PortIdentity} import edu.uci.ics.texera.workflow.common.Marker -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema 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 2144b3bc595..0cd4e20fcf7 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.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.ChannelIdentity -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/ArrowUtils.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/ArrowUtils.scala index 63fd6fc82d7..49ad1e67657 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/ArrowUtils.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/ArrowUtils.scala @@ -1,14 +1,8 @@ package edu.uci.ics.amber.engine.architecture.pythonworker import com.typesafe.scalalogging.LazyLogging -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeTypeUtils.AttributeTypeException -import edu.uci.ics.texera.workflow.common.tuple.schema.{ - Attribute, - AttributeType, - AttributeTypeUtils, - Schema -} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, AttributeTypeUtils, Schema, Tuple} +import AttributeTypeUtils.AttributeTypeException import org.apache.arrow.vector.types.FloatingPointPrecision import org.apache.arrow.vector.types.TimeUnit.MILLISECOND import org.apache.arrow.vector.types.pojo.ArrowType.PrimitiveType 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 a486a377430..848e1d43f7e 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 @@ -14,12 +14,11 @@ import edu.uci.ics.amber.engine.common.ambermessage.InvocationConvertUtils.{ controlInvocationToV2, returnInvocationToV2 } -import edu.uci.ics.amber.engine.common.ambermessage.{PythonControlMessage, _} +import edu.uci.ics.amber.engine.common.ambermessage._ +import edu.uci.ics.amber.engine.common.model.tuple.{Schema, Tuple} import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.{ControlInvocation, ReturnInvocation} import edu.uci.ics.amber.engine.common.virtualidentity.ActorVirtualIdentity import edu.uci.ics.texera.workflow.common.State -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema 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 6ac9291283d..34c9dab9330 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 @@ -9,7 +9,6 @@ import edu.uci.ics.amber.engine.common.ambermessage.InvocationConvertUtils.{ } import edu.uci.ics.amber.engine.common.ambermessage._ import edu.uci.ics.amber.engine.common.virtualidentity.ActorVirtualIdentity -import edu.uci.ics.texera.workflow.common.tuple.Tuple import org.apache.arrow.flight._ import org.apache.arrow.memory.{ArrowBuf, BufferAllocator, RootAllocator} import org.apache.arrow.util.AutoCloseables @@ -20,6 +19,7 @@ import java.net.ServerSocket import java.util.concurrent.atomic.AtomicInteger import scala.collection.mutable import com.twitter.util.Promise +import edu.uci.ics.amber.engine.common.model.tuple.Tuple import edu.uci.ics.texera.workflow.common.{EndOfInputChannel, StartOfInputChannel, State} import java.nio.charset.Charset 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 10bb3e2ae0f..e155b64f8e4 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 @@ -1,8 +1,8 @@ package edu.uci.ics.amber.engine.architecture.sendsemantics.partitioners import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.BroadcastPartitioning +import edu.uci.ics.amber.engine.common.model.tuple.Tuple import edu.uci.ics.amber.engine.common.virtualidentity.ActorVirtualIdentity -import edu.uci.ics.texera.workflow.common.tuple.Tuple 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 deb74bf56da..8aebe1c1349 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 @@ -1,8 +1,8 @@ package edu.uci.ics.amber.engine.architecture.sendsemantics.partitioners import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.HashBasedShufflePartitioning +import edu.uci.ics.amber.engine.common.model.tuple.Tuple import edu.uci.ics.amber.engine.common.virtualidentity.ActorVirtualIdentity -import edu.uci.ics.texera.workflow.common.tuple.Tuple 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 733c4afbed7..01f4f0d1250 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 @@ -1,8 +1,8 @@ package edu.uci.ics.amber.engine.architecture.sendsemantics.partitioners import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning +import edu.uci.ics.amber.engine.common.model.tuple.Tuple import edu.uci.ics.amber.engine.common.virtualidentity.ActorVirtualIdentity -import edu.uci.ics.texera.workflow.common.tuple.Tuple 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 e2a8bec97c9..4664ddecb3e 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 @@ -3,9 +3,9 @@ package edu.uci.ics.amber.engine.architecture.sendsemantics.partitioners 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.engine.common.model.tuple.Tuple import edu.uci.ics.amber.engine.common.virtualidentity.ActorVirtualIdentity import edu.uci.ics.texera.workflow.common.Marker -import edu.uci.ics.texera.workflow.common.tuple.Tuple 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 9b8f5c3e5c9..d961635c94a 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 @@ -1,9 +1,8 @@ package edu.uci.ics.amber.engine.architecture.sendsemantics.partitioners import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.RangeBasedShufflePartitioning +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Tuple} import edu.uci.ics.amber.engine.common.virtualidentity.ActorVirtualIdentity -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeType 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 a0b7e04a327..5bf3bc5bfa5 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 @@ -1,8 +1,8 @@ package edu.uci.ics.amber.engine.architecture.sendsemantics.partitioners import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.RoundRobinPartitioning +import edu.uci.ics.amber.engine.common.model.tuple.Tuple import edu.uci.ics.amber.engine.common.virtualidentity.ActorVirtualIdentity -import edu.uci.ics.texera.workflow.common.tuple.Tuple 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/DataProcessor.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/DataProcessor.scala index 92c134480e2..91f0c924215 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 @@ -22,20 +22,14 @@ import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerState.{ } import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerStatistics import edu.uci.ics.amber.engine.common.ambermessage._ +import edu.uci.ics.amber.engine.common.model.tuple.{FinalizeExecutor, FinalizePort, SchemaEnforceable, Tuple, TupleLike} import edu.uci.ics.amber.engine.common.statetransition.WorkerStateManager -import edu.uci.ics.amber.engine.common.tuple.amber.{ - FinalizeExecutor, - FinalizePort, - SchemaEnforceable, - TupleLike -} import edu.uci.ics.amber.engine.common.virtualidentity.util.{CONTROLLER, SELF} import edu.uci.ics.amber.engine.common.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} import edu.uci.ics.amber.engine.common.workflow.PortIdentity import edu.uci.ics.amber.error.ErrorUtils.{mkConsoleMessage, safely} import edu.uci.ics.texera.workflow.common.{EndOfInputChannel, StartOfInputChannel, State} import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple class DataProcessor( actorId: ActorVirtualIdentity, diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/WorkerResult.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/WorkerResult.scala index 55aa252b1b3..955fe375f46 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/WorkerResult.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/WorkerResult.scala @@ -1,7 +1,7 @@ package edu.uci.ics.amber.engine.architecture.worker +import edu.uci.ics.amber.engine.common.model.tuple.Tuple import edu.uci.ics.texera.workflow.common.IncrementalOutputMode -import edu.uci.ics.texera.workflow.common.tuple.Tuple case class WorkerResult( outputMode: IncrementalOutputMode, 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 2bd7f7d356b..aea31f3ba45 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 @@ -2,13 +2,13 @@ package edu.uci.ics.amber.engine.architecture.worker.managers import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo.generateJavaOpExec import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.InitializeExecutorHandler.InitializeExecutor +import edu.uci.ics.amber.engine.common.model.tuple.TupleLike import edu.uci.ics.amber.engine.common.{ AmberLogging, CheckpointState, CheckpointSupport, VirtualIdentityUtils } -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike import edu.uci.ics.amber.engine.common.virtualidentity.ActorVirtualIdentity import edu.uci.ics.amber.engine.common.workflow.PortIdentity import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/AssignPortHandler.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/AssignPortHandler.scala index f094880438e..544abe33960 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/AssignPortHandler.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/AssignPortHandler.scala @@ -2,9 +2,9 @@ package edu.uci.ics.amber.engine.architecture.worker.promisehandlers import edu.uci.ics.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.AssignPortHandler.AssignPort +import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.rpc.AsyncRPCServer.ControlCommand import edu.uci.ics.amber.engine.common.workflow.PortIdentity -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema object AssignPortHandler { diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/QueryCurrentInputTupleHandler.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/QueryCurrentInputTupleHandler.scala index 94699484c94..804574a2704 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/QueryCurrentInputTupleHandler.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/QueryCurrentInputTupleHandler.scala @@ -2,8 +2,8 @@ package edu.uci.ics.amber.engine.architecture.worker.promisehandlers import edu.uci.ics.amber.engine.architecture.worker.DataProcessorRPCHandlerInitializer import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.QueryCurrentInputTupleHandler.QueryCurrentInputTuple +import edu.uci.ics.amber.engine.common.model.tuple.Tuple import edu.uci.ics.amber.engine.common.rpc.AsyncRPCServer.ControlCommand -import edu.uci.ics.texera.workflow.common.tuple.Tuple object QueryCurrentInputTupleHandler { final case class QueryCurrentInputTuple() extends ControlCommand[Tuple] 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 caaf28cb728..04552bec37e 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,6 +1,6 @@ package edu.uci.ics.amber.engine.common -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.TupleLike import edu.uci.ics.amber.engine.common.workflow.PortIdentity trait CheckpointSupport { diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/SinkOperatorExecutor.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/SinkOperatorExecutor.scala index ac63e1f8409..9430a74ea30 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/SinkOperatorExecutor.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/SinkOperatorExecutor.scala @@ -1,9 +1,8 @@ package edu.uci.ics.amber.engine.common -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.amber.engine.common.workflow.PortIdentity import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple trait SinkOperatorExecutor extends OperatorExecutor { diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/SourceOperatorExecutor.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/SourceOperatorExecutor.scala index 33f2a71730a..5b426ff37de 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/SourceOperatorExecutor.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/SourceOperatorExecutor.scala @@ -1,10 +1,9 @@ package edu.uci.ics.amber.engine.common +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.amber.engine.common.storage.DatasetFileDocument -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike import edu.uci.ics.amber.engine.common.workflow.PortIdentity import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple import java.io.{FileInputStream, InputStream} diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/DataPayload.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/DataPayload.scala index 64f0e6a80bd..c64e990e9ed 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/DataPayload.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/DataPayload.scala @@ -1,7 +1,7 @@ package edu.uci.ics.amber.engine.common.ambermessage +import edu.uci.ics.amber.engine.common.model.tuple.Tuple import edu.uci.ics.texera.workflow.common.Marker -import edu.uci.ics.texera.workflow.common.tuple.Tuple sealed trait DataPayload extends WorkflowFIFOMessagePayload {} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/tuple/schema/Attribute.java b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/Attribute.java similarity index 97% rename from core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/tuple/schema/Attribute.java rename to core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/Attribute.java index f3f36395669..b7d77dfdc2a 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/tuple/schema/Attribute.java +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/Attribute.java @@ -1,4 +1,4 @@ -package edu.uci.ics.texera.workflow.common.tuple.schema; +package edu.uci.ics.amber.engine.common.model.tuple; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/tuple/schema/AttributeType.java b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/AttributeType.java similarity index 98% rename from core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/tuple/schema/AttributeType.java rename to core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/AttributeType.java index 2d5e2bb2443..38d0a650610 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/tuple/schema/AttributeType.java +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/AttributeType.java @@ -1,4 +1,4 @@ -package edu.uci.ics.texera.workflow.common.tuple.schema; +package edu.uci.ics.amber.engine.common.model.tuple; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/tuple/schema/AttributeTypeUtils.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/AttributeTypeUtils.scala similarity index 86% rename from core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/tuple/schema/AttributeTypeUtils.scala rename to core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/AttributeTypeUtils.scala index 7a7f09328ac..b4f349cb154 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/tuple/schema/AttributeTypeUtils.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/AttributeTypeUtils.scala @@ -1,8 +1,6 @@ -package edu.uci.ics.texera.workflow.common.tuple.schema +package edu.uci.ics.amber.engine.common.model.tuple + import com.github.sisyphsu.dateparser.DateParserUtils -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeType._ import edu.uci.ics.texera.workflow.operators.typecasting.TypeCastingUnit import java.sql.Timestamp @@ -33,9 +31,9 @@ object AttributeTypeUtils extends Serializable { for (i <- attributes.indices) { if (attributes.apply(i).getName.equals(attribute)) { resultType match { - case STRING | INTEGER | DOUBLE | LONG | BOOLEAN | TIMESTAMP | BINARY => + case AttributeType.STRING | AttributeType.INTEGER | AttributeType.DOUBLE | AttributeType.LONG | AttributeType.BOOLEAN | AttributeType.TIMESTAMP | AttributeType.BINARY => builder.add(attribute, resultType) - case ANY | _ => + case AttributeType.ANY | _ => builder.add(attribute, attributes.apply(i).getType) } } else { @@ -105,14 +103,14 @@ object AttributeTypeUtils extends Serializable { ): Any = { if (field == null) return null attributeType match { - case INTEGER => parseInteger(field) - case LONG => parseLong(field) - case DOUBLE => parseDouble(field) - case BOOLEAN => parseBoolean(field) - case TIMESTAMP => parseTimestamp(field) - case STRING => field.toString - case BINARY => field - case ANY | _ => field + case AttributeType.INTEGER => parseInteger(field) + case AttributeType.LONG => parseLong(field) + case AttributeType.DOUBLE => parseDouble(field) + case AttributeType.BOOLEAN => parseBoolean(field) + case AttributeType.TIMESTAMP => parseTimestamp(field) + case AttributeType.STRING => field.toString + case AttributeType.BINARY => field + case AttributeType.ANY | _ => field } } @@ -227,7 +225,7 @@ object AttributeTypeUtils extends Serializable { for (fields <- fieldsIterator) { if (attributeTypes.isEmpty) { - attributeTypes = Array.fill[AttributeType](fields.length)(INTEGER) + attributeTypes = Array.fill[AttributeType](fields.length)(AttributeType.INTEGER) } inferRow(attributeTypes, fields) } @@ -245,51 +243,51 @@ object AttributeTypeUtils extends Serializable { private def tryParseInteger(fieldValue: Any): AttributeType = { if (fieldValue == null) - return INTEGER + return AttributeType.INTEGER allCatch opt parseInteger(fieldValue) match { - case Some(_) => INTEGER + case Some(_) => AttributeType.INTEGER case None => tryParseLong(fieldValue) } } private def tryParseLong(fieldValue: Any): AttributeType = { if (fieldValue == null) - return LONG + return AttributeType.LONG allCatch opt parseLong(fieldValue) match { - case Some(_) => LONG + case Some(_) => AttributeType.LONG case None => tryParseTimestamp(fieldValue) } } private def tryParseTimestamp(fieldValue: Any): AttributeType = { if (fieldValue == null) - return TIMESTAMP + return AttributeType.TIMESTAMP allCatch opt parseTimestamp(fieldValue) match { - case Some(_) => TIMESTAMP + case Some(_) => AttributeType.TIMESTAMP case None => tryParseDouble(fieldValue) } } private def tryParseDouble(fieldValue: Any): AttributeType = { if (fieldValue == null) - return DOUBLE + return AttributeType.DOUBLE allCatch opt parseDouble(fieldValue) match { - case Some(_) => DOUBLE + case Some(_) => AttributeType.DOUBLE case None => tryParseBoolean(fieldValue) } } private def tryParseBoolean(fieldValue: Any): AttributeType = { if (fieldValue == null) - return BOOLEAN + return AttributeType.BOOLEAN allCatch opt parseBoolean(fieldValue) match { - case Some(_) => BOOLEAN + case Some(_) => AttributeType.BOOLEAN case None => tryParseString() } } private def tryParseString(): AttributeType = { - STRING + AttributeType.STRING } /** @@ -300,13 +298,13 @@ object AttributeTypeUtils extends Serializable { */ def inferField(attributeType: AttributeType, fieldValue: Any): AttributeType = { attributeType match { - case STRING => tryParseString() - case BOOLEAN => tryParseBoolean(fieldValue) - case DOUBLE => tryParseDouble(fieldValue) - case LONG => tryParseLong(fieldValue) - case INTEGER => tryParseInteger(fieldValue) - case TIMESTAMP => tryParseTimestamp(fieldValue) - case BINARY => tryParseString() + case AttributeType.STRING => tryParseString() + case AttributeType.BOOLEAN => tryParseBoolean(fieldValue) + case AttributeType.DOUBLE => tryParseDouble(fieldValue) + case AttributeType.LONG => tryParseLong(fieldValue) + case AttributeType.INTEGER => tryParseInteger(fieldValue) + case AttributeType.TIMESTAMP => tryParseTimestamp(fieldValue) + case AttributeType.BINARY => tryParseString() case _ => tryParseString() } } diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/tuple/schema/Schema.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/Schema.scala similarity index 99% rename from core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/tuple/schema/Schema.scala rename to core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/Schema.scala index 0c63956238c..e56b8afaaa3 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/tuple/schema/Schema.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/Schema.scala @@ -1,4 +1,4 @@ -package edu.uci.ics.texera.workflow.common.tuple.schema +package edu.uci.ics.amber.engine.common.model.tuple import com.fasterxml.jackson.annotation.{JsonCreator, JsonIgnore, JsonProperty} import com.google.common.base.Preconditions.checkNotNull diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/tuple/Tuple.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/Tuple.scala similarity index 95% rename from core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/tuple/Tuple.scala rename to core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/Tuple.scala index 7d955fc7869..d91b301a0d8 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/tuple/Tuple.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/Tuple.scala @@ -1,21 +1,20 @@ -package edu.uci.ics.texera.workflow.common.tuple +package edu.uci.ics.amber.engine.common.model.tuple import com.fasterxml.jackson.annotation.{JsonCreator, JsonIgnore, JsonProperty} -import com.fasterxml.jackson.databind.node.ObjectNode import com.fasterxml.jackson.databind.JsonNode +import com.fasterxml.jackson.databind.node.ObjectNode import com.google.common.base.Preconditions.checkNotNull -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} -import edu.uci.ics.amber.engine.common.tuple.amber.SeqTupleLike +import Tuple.checkSchemaMatchesFields +import TupleUtils.document2Tuple import edu.uci.ics.texera.Utils -import edu.uci.ics.texera.workflow.common.tuple.Tuple.checkSchemaMatchesFields -import edu.uci.ics.texera.workflow.common.tuple.TupleUtils.document2Tuple -import edu.uci.ics.texera.workflow.common.tuple.exception.TupleBuildingException import org.bson.Document import org.ehcache.sizeof.SizeOf import java.util import scala.collection.mutable +class TupleBuildingException(errorMessage: String) extends RuntimeException(errorMessage) {} + /** * Represents a tuple in a data processing workflow, encapsulating a schema and corresponding field values. * diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/tuple/amber/TupleLike.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/TupleLike.scala similarity index 96% rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/tuple/amber/TupleLike.scala rename to core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/TupleLike.scala index a26fdca7d4c..7c00264cf6e 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/tuple/amber/TupleLike.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/TupleLike.scala @@ -1,8 +1,6 @@ -package edu.uci.ics.amber.engine.common.tuple.amber +package edu.uci.ics.amber.engine.common.model.tuple import edu.uci.ics.amber.engine.common.workflow.PortIdentity -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema import scala.jdk.CollectionConverters.CollectionHasAsScala diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/tuple/TupleUtils.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/TupleUtils.scala similarity index 88% rename from core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/tuple/TupleUtils.scala rename to core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/TupleUtils.scala index affb9d5220a..8c04f659912 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/tuple/TupleUtils.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/TupleUtils.scala @@ -1,15 +1,11 @@ -package edu.uci.ics.texera.workflow.common.tuple +package edu.uci.ics.amber.engine.common.model.tuple import com.fasterxml.jackson.databind.JsonNode +import AttributeType._ +import AttributeTypeUtils.{inferSchemaFromRows, parseField} import edu.uci.ics.texera.Utils.objectMapper -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeTypeUtils.{ - inferSchemaFromRows, - parseField -} -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, Schema} import edu.uci.ics.texera.workflow.operators.source.scan.json.JSONUtil.JSONToMap import org.bson.Document -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeType._ import org.bson.types.Binary import scala.collection.mutable.ArrayBuffer diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/response/SchemaPropagationResponse.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/response/SchemaPropagationResponse.scala index cc2244eaccc..c017ce54ead 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/response/SchemaPropagationResponse.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/model/http/response/SchemaPropagationResponse.scala @@ -1,6 +1,6 @@ package edu.uci.ics.texera.web.model.http.response -import edu.uci.ics.texera.workflow.common.tuple.schema.Attribute +import edu.uci.ics.amber.engine.common.model.tuple.Attribute case class SchemaPropagationResponse( code: Int, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/WorkflowCompilationResource.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/WorkflowCompilationResource.scala index 834966df989..4fcbb891d19 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/WorkflowCompilationResource.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/WorkflowCompilationResource.scala @@ -1,10 +1,10 @@ package edu.uci.ics.texera.web.resource import com.typesafe.scalalogging.LazyLogging +import edu.uci.ics.amber.engine.common.model.tuple.Attribute import edu.uci.ics.amber.engine.common.virtualidentity.WorkflowIdentity import edu.uci.ics.texera.web.model.websocket.request.LogicalPlanPojo import edu.uci.ics.texera.workflow.common.WorkflowContext -import edu.uci.ics.texera.workflow.common.tuple.schema.Attribute import edu.uci.ics.texera.workflow.common.workflow.{PhysicalPlan, WorkflowCompiler} import org.jooq.types.UInteger diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/DatasetResource.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/DatasetResource.scala index b7156874f16..f8e4c15afca 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/DatasetResource.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/DatasetResource.scala @@ -4,58 +4,15 @@ import edu.uci.ics.texera.Utils.withTransaction import edu.uci.ics.texera.web.SqlServer import edu.uci.ics.texera.web.auth.SessionUser import edu.uci.ics.texera.web.model.jooq.generated.enums.DatasetUserAccessPrivilege -import edu.uci.ics.texera.web.model.jooq.generated.tables.daos.{ - DatasetDao, - DatasetUserAccessDao, - DatasetVersionDao -} -import edu.uci.ics.texera.web.model.jooq.generated.tables.pojos.{ - Dataset, - DatasetUserAccess, - DatasetVersion, - User -} +import edu.uci.ics.texera.web.model.jooq.generated.tables.daos.{DatasetDao, DatasetUserAccessDao, DatasetVersionDao} +import edu.uci.ics.texera.web.model.jooq.generated.tables.pojos.{Dataset, DatasetUserAccess, DatasetVersion, User} import edu.uci.ics.texera.web.model.jooq.generated.tables.Dataset.DATASET import edu.uci.ics.texera.web.model.jooq.generated.tables.User.USER import edu.uci.ics.texera.web.model.jooq.generated.tables.DatasetUserAccess.DATASET_USER_ACCESS import edu.uci.ics.texera.web.model.jooq.generated.tables.DatasetVersion.DATASET_VERSION -import edu.uci.ics.texera.web.resource.dashboard.user.dataset.DatasetAccessResource.{ - getDatasetUserAccessPrivilege, - getOwner, - userHasReadAccess, - userHasWriteAccess, - userOwnDataset -} -import edu.uci.ics.texera.web.resource.dashboard.user.dataset.DatasetResource.{ - DATASET_IS_PRIVATE, - DATASET_IS_PUBLIC, - DashboardDataset, - DashboardDatasetVersion, - DatasetDescriptionModification, - DatasetIDs, - DatasetNameModification, - DatasetVersionRootFileNodes, - DatasetVersions, - ERR_DATASET_CREATION_FAILED_MESSAGE, - ERR_DATASET_NAME_ALREADY_EXISTS, - ERR_USER_HAS_NO_ACCESS_TO_DATASET_MESSAGE, - ListDatasetsResponse, - context, - createNewDatasetVersionFromFormData, - getDashboardDataset, - getDatasetByID, - getDatasetLatestVersion, - getDatasetVersionByID, - getDatasetVersions, - getFileNodesOfCertainVersion, - getUserDatasets, - resolvePath, - retrievePublicDatasets -} -import edu.uci.ics.texera.web.resource.dashboard.user.dataset.`type`.{ - DatasetFileNode, - PhysicalFileNode -} +import edu.uci.ics.texera.web.resource.dashboard.user.dataset.DatasetAccessResource.{getDatasetUserAccessPrivilege, getOwner, userHasReadAccess, userHasWriteAccess, userOwnDataset} +import edu.uci.ics.texera.web.resource.dashboard.user.dataset.DatasetResource.{DATASET_IS_PRIVATE, DATASET_IS_PUBLIC, DashboardDataset, DashboardDatasetVersion, DatasetDescriptionModification, DatasetIDs, DatasetNameModification, DatasetVersionRootFileNodes, DatasetVersions, ERR_DATASET_CREATION_FAILED_MESSAGE, ERR_DATASET_NAME_ALREADY_EXISTS, ERR_USER_HAS_NO_ACCESS_TO_DATASET_MESSAGE, ListDatasetsResponse, context, createNewDatasetVersionFromFormData, getDashboardDataset, getDatasetByID, getDatasetLatestVersion, getDatasetVersionByID, getDatasetVersions, getFileNodesOfCertainVersion, getUserDatasets, resolvePath, retrievePublicDatasets} +import edu.uci.ics.texera.web.resource.dashboard.user.dataset.`type`.{DatasetFileNode, PhysicalFileNode} import edu.uci.ics.texera.web.resource.dashboard.user.dataset.service.GitVersionControlLocalFileStorage import edu.uci.ics.texera.web.resource.dashboard.user.dataset.utils.PathUtils import io.dropwizard.auth.Auth @@ -73,24 +30,13 @@ import java.util.zip.{ZipEntry, ZipOutputStream} import java.util import java.util.concurrent.locks.ReentrantLock import javax.annotation.security.RolesAllowed -import javax.ws.rs.{ - BadRequestException, - Consumes, - ForbiddenException, - GET, - NotFoundException, - POST, - Path, - PathParam, - Produces, - QueryParam, - WebApplicationException -} +import javax.ws.rs.{BadRequestException, Consumes, ForbiddenException, GET, NotFoundException, POST, Path, PathParam, Produces, QueryParam, WebApplicationException} import javax.ws.rs.core.{MediaType, Response, StreamingOutput} import scala.collection.convert.ImplicitConversions.`collection AsScalaIterable` import scala.collection.mutable import scala.collection.mutable.ListBuffer -import scala.jdk.CollectionConverters._ +import scala.jdk.CollectionConverters.ListHasAsScala + object DatasetResource { val DATASET_IS_PUBLIC: Byte = 1; 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 a1eef1ea15a..525ab311317 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 @@ -10,6 +10,7 @@ import edu.uci.ics.amber.engine.architecture.controller.ControllerEvent.{ } import edu.uci.ics.amber.engine.common.{AmberConfig, AmberRuntime} import edu.uci.ics.amber.engine.common.client.AmberClient +import edu.uci.ics.amber.engine.common.model.tuple.Tuple import edu.uci.ics.amber.engine.common.virtualidentity.OperatorIdentity import edu.uci.ics.texera.workflow.common.IncrementalOutputMode.{SET_DELTA, SET_SNAPSHOT} import edu.uci.ics.texera.web.model.websocket.event.{ @@ -35,7 +36,6 @@ import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.{ import edu.uci.ics.texera.web.SubscriptionManager import edu.uci.ics.texera.workflow.common.IncrementalOutputMode import edu.uci.ics.texera.workflow.common.storage.OpResultStorage -import edu.uci.ics.texera.workflow.common.tuple.Tuple import edu.uci.ics.texera.workflow.common.workflow.LogicalPlan import edu.uci.ics.texera.workflow.operators.sink.managed.ProgressiveSinkOpDesc 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 783505424f4..59718804715 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 @@ -11,6 +11,7 @@ import com.google.api.services.drive.Drive import com.google.api.services.drive.model.{File, FileList, Permission} import com.google.api.services.sheets.v4.Sheets import com.google.api.services.sheets.v4.model.{Spreadsheet, SpreadsheetProperties, ValueRange} +import edu.uci.ics.amber.engine.common.model.tuple.Tuple import edu.uci.ics.amber.engine.common.virtualidentity.OperatorIdentity import edu.uci.ics.texera.Utils.retry import edu.uci.ics.texera.web.model.jooq.generated.tables.pojos.User @@ -21,7 +22,6 @@ import edu.uci.ics.texera.web.resource.dashboard.user.dataset.DatasetResource.cr import edu.uci.ics.texera.web.resource.dashboard.user.dataset.utils.PathUtils import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowVersionResource import edu.uci.ics.texera.workflow.common.storage.OpResultStorage -import edu.uci.ics.texera.workflow.common.tuple.Tuple import edu.uci.ics.texera.workflow.operators.sink.storage.SinkStorageReader import org.jooq.types.UInteger diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/Marker.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/Marker.scala index 41ef2fa6707..e422634ff39 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/Marker.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/Marker.scala @@ -1,7 +1,6 @@ package edu.uci.ics.texera.workflow.common -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema, Attribute} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, Tuple} import scala.collection.mutable sealed trait Marker diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/ProgressiveUtils.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/ProgressiveUtils.scala index 5b4c7f0b7d1..e173adaa285 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/ProgressiveUtils.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/ProgressiveUtils.scala @@ -1,7 +1,6 @@ package edu.uci.ics.texera.workflow.common -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, Tuple} object ProgressiveUtils { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/LogicalOp.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/LogicalOp.scala index c178b2c5f25..3b78a6b788d 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/LogicalOp.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/LogicalOp.scala @@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.{ } import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp +import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ ExecutionIdentity, OperatorIdentity, @@ -18,7 +19,6 @@ import edu.uci.ics.amber.engine.common.virtualidentity.{ import edu.uci.ics.amber.engine.common.workflow.PortIdentity import edu.uci.ics.texera.web.OPversion import edu.uci.ics.texera.workflow.common.metadata.{OperatorInfo, PropertyNameConstants} -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema import edu.uci.ics.texera.workflow.common.workflow.PhysicalPlan import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.operators.aggregate.AggregateOpDesc diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/OperatorExecutor.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/OperatorExecutor.scala index 327e3a1adb9..d6119d93d47 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/OperatorExecutor.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/OperatorExecutor.scala @@ -1,9 +1,8 @@ package edu.uci.ics.texera.workflow.common.operators -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.amber.engine.common.workflow.PortIdentity import edu.uci.ics.texera.workflow.common.State -import edu.uci.ics.texera.workflow.common.tuple.Tuple trait OperatorExecutor { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/filter/FilterOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/filter/FilterOpDesc.scala index 26467e1270a..6a6edf73a7a 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/filter/FilterOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/filter/FilterOpDesc.scala @@ -2,9 +2,9 @@ package edu.uci.ics.texera.workflow.common.operators.filter import com.google.common.base.Preconditions import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp +import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.operators.{LogicalOp, StateTransferFunc} -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema import scala.util.{Success, Try} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/filter/FilterOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/filter/FilterOpExec.scala index 475543776bf..bb461ec6b86 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/filter/FilterOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/filter/FilterOpExec.scala @@ -1,8 +1,7 @@ package edu.uci.ics.texera.workflow.common.operators.filter -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple abstract class FilterOpExec extends OperatorExecutor with Serializable { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/flatmap/FlatMapOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/flatmap/FlatMapOpExec.scala index 50fa4e6fb28..e218442e586 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/flatmap/FlatMapOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/flatmap/FlatMapOpExec.scala @@ -1,8 +1,7 @@ package edu.uci.ics.texera.workflow.common.operators.flatmap -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple /** * Executes a flatMap() operation. diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/map/MapOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/map/MapOpExec.scala index 9926701e731..d845a839ec2 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/map/MapOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/map/MapOpExec.scala @@ -1,8 +1,7 @@ package edu.uci.ics.texera.workflow.common.operators.map -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple /** * Common operator executor of a map() function diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/source/SourceOperatorDescriptor.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/source/SourceOperatorDescriptor.scala index 6c44e9e97ad..298264ccfd9 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/source/SourceOperatorDescriptor.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/source/SourceOperatorDescriptor.scala @@ -1,8 +1,8 @@ package edu.uci.ics.texera.workflow.common.operators.source import com.google.common.base.Preconditions +import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.texera.workflow.common.operators.LogicalOp -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema abstract class SourceOperatorDescriptor extends LogicalOp { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/tuple/exception/TupleBuildingException.java b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/tuple/exception/TupleBuildingException.java deleted file mode 100644 index d14a8d0050a..00000000000 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/tuple/exception/TupleBuildingException.java +++ /dev/null @@ -1,8 +0,0 @@ -package edu.uci.ics.texera.workflow.common.tuple.exception; - -public class TupleBuildingException extends RuntimeException { - - public TupleBuildingException(String errorMessage) { - super(errorMessage); - } -} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/LogicalPlan.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/LogicalPlan.scala index 65f9695fb78..84c56903842 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/LogicalPlan.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/LogicalPlan.scala @@ -1,13 +1,13 @@ package edu.uci.ics.texera.workflow.common.workflow import com.typesafe.scalalogging.LazyLogging +import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.OperatorIdentity import edu.uci.ics.amber.engine.common.workflow.PortIdentity import edu.uci.ics.texera.web.model.websocket.request.LogicalPlanPojo import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.common.operators.LogicalOp import edu.uci.ics.texera.workflow.common.operators.source.SourceOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema import org.jgrapht.graph.DirectedAcyclicGraph import org.jgrapht.util.SupplierUtil diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/WorkflowCompiler.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/WorkflowCompiler.scala index 341bfc25f52..9e69586de73 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/WorkflowCompiler.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/WorkflowCompiler.scala @@ -3,6 +3,7 @@ package edu.uci.ics.texera.workflow.common.workflow import com.google.protobuf.timestamp.Timestamp import com.typesafe.scalalogging.LazyLogging import edu.uci.ics.amber.engine.architecture.controller.Workflow +import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.OperatorIdentity import edu.uci.ics.amber.error.ErrorUtils.getStackTraceWithAllCauses import edu.uci.ics.texera.Utils.objectMapper @@ -15,7 +16,6 @@ import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.FAILE import edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.common.storage.OpResultStorage -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema import edu.uci.ics.texera.workflow.operators.sink.managed.ProgressiveSinkOpDesc import edu.uci.ics.texera.workflow.operators.visualization.VisualizationConstants diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregateOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregateOpDesc.scala index 183c2491a3f..813f9ae748e 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregateOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregateOpDesc.scala @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ ExecutionIdentity, PhysicalOpIdentity, @@ -13,7 +14,6 @@ import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, Physical import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeNameList import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.LogicalOp -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema import edu.uci.ics.texera.workflow.common.workflow.{HashPartition, PhysicalPlan} class AggregateOpDesc extends LogicalOp { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregateOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregateOpExec.scala index 8d894291eb4..9daf461fc64 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregateOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregateOpExec.scala @@ -1,8 +1,7 @@ package edu.uci.ics.texera.workflow.operators.aggregate -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregationOperation.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregationOperation.scala index e6e8b7405b5..9ec76c4701c 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregationOperation.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregationOperation.scala @@ -3,9 +3,8 @@ package edu.uci.ics.texera.workflow.operators.aggregate import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeTypeUtils.parseTimestamp -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType} +import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.parseTimestamp +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Tuple} import java.sql.Timestamp diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/DistributedAggregation.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/DistributedAggregation.scala index 4b7e3a1057d..ecaff4774af 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/DistributedAggregation.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/DistributedAggregation.scala @@ -1,6 +1,6 @@ package edu.uci.ics.texera.workflow.operators.aggregate -import edu.uci.ics.texera.workflow.common.tuple.Tuple +import edu.uci.ics.amber.engine.common.model.tuple.Tuple /** * This class defines the necessary functions required by a distributed aggregation. diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpDesc.scala index c3fc8049360..7a3681fb8b3 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpDesc.scala @@ -2,11 +2,11 @@ package edu.uci.ics.texera.workflow.operators.cartesianProduct import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, PortIdentity} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.LogicalOp -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, Schema} class CartesianProductOpDesc extends LogicalOp { override def getPhysicalOp( diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpExec.scala index a3d1c0b7a07..f2cabe9047d 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpExec.scala @@ -1,8 +1,7 @@ package edu.uci.ics.texera.workflow.operators.cartesianProduct -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple import edu.uci.ics.texera.workflow.operators.hashJoin.JoinUtils import scala.collection.mutable.ArrayBuffer diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpDesc.scala index 2a0f7e0f070..cf9d617cf53 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpDesc.scala @@ -4,12 +4,12 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.google.common.base.Preconditions import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.map.MapOpDesc -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema} /** * Dictionary matcher operator matches a tuple if the specified column is in the given dictionary. diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpExec.scala index a0be7a83d38..890b0c76476 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpExec.scala @@ -1,9 +1,8 @@ package edu.uci.ics.texera.workflow.operators.dictionary -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.texera.Utils import edu.uci.ics.texera.workflow.common.operators.map.MapOpExec -import edu.uci.ics.texera.workflow.common.tuple.Tuple import org.apache.lucene.analysis.Analyzer import org.apache.lucene.analysis.en.EnglishAnalyzer import org.apache.lucene.analysis.tokenattributes.CharTermAttribute diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpDesc.scala index fdc6bd7e53d..c4862bf0b30 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpDesc.scala @@ -3,11 +3,11 @@ package edu.uci.ics.texera.workflow.operators.difference import com.google.common.base.Preconditions import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, PortIdentity} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.LogicalOp -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema import edu.uci.ics.texera.workflow.common.workflow.HashPartition class DifferenceOpDesc extends LogicalOp { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpExec.scala index d46ad826007..84e9257d9c9 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpExec.scala @@ -1,8 +1,7 @@ package edu.uci.ics.texera.workflow.operators.difference -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpDesc.scala index f2a1a2c7896..199b7550627 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpDesc.scala @@ -3,11 +3,11 @@ package edu.uci.ics.texera.workflow.operators.distinct import com.google.common.base.Preconditions import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.LogicalOp -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema import edu.uci.ics.texera.workflow.common.workflow.HashPartition class DistinctOpDesc extends LogicalOp { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpExec.scala index 640de4d947f..2124a9c7b7f 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpExec.scala @@ -1,8 +1,7 @@ package edu.uci.ics.texera.workflow.operators.distinct -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpDesc.scala index 17faf460cf1..ea450857138 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpDesc.scala @@ -5,12 +5,12 @@ import com.google.common.base.Preconditions import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.LogicalOp -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} class BulkDownloaderOpDesc extends LogicalOp { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpExec.scala index 3125b0cdfc3..d3f399ce574 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpExec.scala @@ -1,9 +1,8 @@ package edu.uci.ics.texera.workflow.operators.download -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple import edu.uci.ics.texera.workflow.operators.source.fetcher.URLFetchUtil.getInputStreamFromURL import java.net.URL diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/dummy/DummyOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/dummy/DummyOpDesc.scala index 0168e35aa58..65325c6d750 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/dummy/DummyOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/dummy/DummyOpDesc.scala @@ -2,11 +2,11 @@ package edu.uci.ics.texera.workflow.operators.dummy import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle +import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PortDescription import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, PortIdentity} import edu.uci.ics.texera.workflow.common.operators.{LogicalOp, PortDescriptor} -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema class DummyOpDesc extends LogicalOp with PortDescriptor { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/filter/FilterPredicate.java b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/filter/FilterPredicate.java index 12d08a8f1d9..48dad74ea24 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/filter/FilterPredicate.java +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/filter/FilterPredicate.java @@ -4,11 +4,12 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject; import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaString; +import edu.uci.ics.amber.engine.common.tuple.AttributeTypeUtils; import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName; import edu.uci.ics.texera.workflow.common.metadata.annotations.HideAnnotation; -import edu.uci.ics.texera.workflow.common.tuple.Tuple; -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeType; -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeTypeUtils; +import edu.uci.ics.amber.engine.common.model.tuple.Tuple; +import edu.uci.ics.amber.engine.common.model.tuple.AttributeType; + import java.sql.Timestamp; import java.util.Objects; diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/filter/SpecializedFilterOpExec.java b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/filter/SpecializedFilterOpExec.java index 1d033189c26..c227f933cfb 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/filter/SpecializedFilterOpExec.java +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/filter/SpecializedFilterOpExec.java @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.filter; import edu.uci.ics.texera.workflow.common.operators.filter.FilterOpExec; -import edu.uci.ics.texera.workflow.common.tuple.Tuple; +import edu.uci.ics.amber.engine.common.model.tuple.Tuple; import scala.Function1; import java.io.Serializable; diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinBuildOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinBuildOpExec.scala index 3c8d2bda78d..fcf2ab62c32 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinBuildOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinBuildOpExec.scala @@ -1,8 +1,7 @@ package edu.uci.ics.texera.workflow.operators.hashJoin -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple import scala.collection.mutable import scala.collection.mutable.ListBuffer diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinOpDesc.scala index c4e315fd88d..9e40461a7ba 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinOpDesc.scala @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ ExecutionIdentity, PhysicalOpIdentity, @@ -17,7 +18,6 @@ import edu.uci.ics.texera.workflow.common.metadata.annotations.{ } import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.LogicalOp -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.common.workflow.{HashPartition, OneToOnePartition, PhysicalPlan} object HashJoinOpDesc { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinProbeOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinProbeOpExec.scala index c6a5e0bef85..2acf6d55ed8 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinProbeOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinProbeOpExec.scala @@ -1,8 +1,7 @@ package edu.uci.ics.texera.workflow.operators.hashJoin -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple import edu.uci.ics.texera.workflow.operators.hashJoin.HashJoinOpDesc.HASH_JOIN_INTERNAL_KEY_NAME import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/huggingFace/HuggingFaceIrisLogisticRegressionOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/huggingFace/HuggingFaceIrisLogisticRegressionOpDesc.scala index 2990b180237..271633d52ff 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/huggingFace/HuggingFaceIrisLogisticRegressionOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/huggingFace/HuggingFaceIrisLogisticRegressionOpDesc.scala @@ -1,11 +1,11 @@ package edu.uci.ics.texera.workflow.operators.huggingFace import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema} class HuggingFaceIrisLogisticRegressionOpDesc extends PythonOperatorDescriptor { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/huggingFace/HuggingFaceSentimentAnalysisOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/huggingFace/HuggingFaceSentimentAnalysisOpDesc.scala index e00b1acbf85..3ae360b5e89 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/huggingFace/HuggingFaceSentimentAnalysisOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/huggingFace/HuggingFaceSentimentAnalysisOpDesc.scala @@ -1,11 +1,11 @@ package edu.uci.ics.texera.workflow.operators.huggingFace import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema} class HuggingFaceSentimentAnalysisOpDesc extends PythonOperatorDescriptor { @JsonProperty(value = "attribute", required = true) diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/huggingFace/HuggingFaceSpamSMSDetectionOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/huggingFace/HuggingFaceSpamSMSDetectionOpDesc.scala index 0a816eb45c0..1b35c5a0183 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/huggingFace/HuggingFaceSpamSMSDetectionOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/huggingFace/HuggingFaceSpamSMSDetectionOpDesc.scala @@ -1,11 +1,11 @@ package edu.uci.ics.texera.workflow.operators.huggingFace import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema} class HuggingFaceSpamSMSDetectionOpDesc extends PythonOperatorDescriptor { @JsonProperty(value = "attribute", required = true) diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/huggingFace/HuggingFaceTextSummarizationOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/huggingFace/HuggingFaceTextSummarizationOpDesc.scala index c537036a0d3..523bab2beff 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/huggingFace/HuggingFaceTextSummarizationOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/huggingFace/HuggingFaceTextSummarizationOpDesc.scala @@ -1,11 +1,11 @@ package edu.uci.ics.texera.workflow.operators.huggingFace import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema} class HuggingFaceTextSummarizationOpDesc extends PythonOperatorDescriptor { @JsonProperty(value = "attribute", required = true) diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpDesc.scala index 38371226200..90d4c8206c4 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpDesc.scala @@ -3,11 +3,11 @@ package edu.uci.ics.texera.workflow.operators.intersect import com.google.common.base.Preconditions import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, PortIdentity} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.LogicalOp -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema import edu.uci.ics.texera.workflow.common.workflow.HashPartition class IntersectOpDesc extends LogicalOp { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpExec.scala index 328e2927cc0..f11304da99b 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpExec.scala @@ -1,8 +1,7 @@ package edu.uci.ics.texera.workflow.operators.intersect -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalJoinOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalJoinOpDesc.scala index 208b61ee7c9..e4ce6bee0ef 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalJoinOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalJoinOpDesc.scala @@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, PortIdentity} import edu.uci.ics.texera.workflow.common.metadata.annotations.{ @@ -13,7 +14,6 @@ import edu.uci.ics.texera.workflow.common.metadata.annotations.{ } import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.LogicalOp -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, Schema} import edu.uci.ics.texera.workflow.common.workflow.HashPartition /** This Operator have two assumptions: diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalJoinOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalJoinOpExec.scala index de15fe20a17..e30d70468bb 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalJoinOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalJoinOpExec.scala @@ -1,10 +1,8 @@ package edu.uci.ics.texera.workflow.operators.intervalJoin import edu.uci.ics.amber.engine.common.amberexception.WorkflowRuntimeException -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Tuple, TupleLike} import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeType import edu.uci.ics.texera.workflow.operators.hashJoin.JoinUtils import java.sql.Timestamp diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/keywordSearch/KeywordSearchOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/keywordSearch/KeywordSearchOpExec.scala index 52e88bb7ad0..b0b043ba7b7 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/keywordSearch/KeywordSearchOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/keywordSearch/KeywordSearchOpExec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.keywordSearch +import edu.uci.ics.amber.engine.common.model.tuple.Tuple import edu.uci.ics.texera.workflow.common.operators.filter.FilterOpExec -import edu.uci.ics.texera.workflow.common.tuple.Tuple import org.apache.lucene.queryparser.classic.QueryParser import org.apache.lucene.analysis.core.SimpleAnalyzer import org.apache.lucene.index.memory.MemoryIndex diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/limit/LimitOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/limit/LimitOpDesc.scala index de1850ee07e..6ffaec9f94c 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/limit/LimitOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/limit/LimitOpDesc.scala @@ -4,11 +4,11 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.{LogicalOp, StateTransferFunc} -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema import scala.util.{Success, Try} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/limit/LimitOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/limit/LimitOpExec.scala index 7407dd06c6b..ca05d2e9c7e 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/limit/LimitOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/limit/LimitOpExec.scala @@ -1,8 +1,7 @@ package edu.uci.ics.texera.workflow.operators.limit -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple class LimitOpExec(limit: Int) extends OperatorExecutor { var count = 0 diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/machineLearning/Scorer/MachineLearningScorerOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/machineLearning/Scorer/MachineLearningScorerOpDesc.scala index e34c01addab..6f5fe755d26 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/machineLearning/Scorer/MachineLearningScorerOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/machineLearning/Scorer/MachineLearningScorerOpDesc.scala @@ -6,6 +6,7 @@ import com.kjetland.jackson.jsonSchema.annotations.{ JsonSchemaString, JsonSchemaTitle } +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.annotations.{ AutofillAttributeName, @@ -13,7 +14,6 @@ import edu.uci.ics.texera.workflow.common.metadata.annotations.{ } import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} class MachineLearningScorerOpDesc extends PythonOperatorDescriptor { @JsonProperty(required = true, defaultValue = "false") diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/machineLearning/sklearnAdvanced/base/SklearnAdvancedBaseDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/machineLearning/sklearnAdvanced/base/SklearnAdvancedBaseDesc.scala index 64d3b9b6279..dc8535c0a5a 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/machineLearning/sklearnAdvanced/base/SklearnAdvancedBaseDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/machineLearning/sklearnAdvanced/base/SklearnAdvancedBaseDesc.scala @@ -2,6 +2,7 @@ package edu.uci.ics.texera.workflow.operators.machineLearning.sklearnAdvanced.ba import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, PortIdentity} import edu.uci.ics.texera.workflow.common.metadata.annotations.{ AutofillAttributeName, @@ -9,7 +10,6 @@ import edu.uci.ics.texera.workflow.common.metadata.annotations.{ } import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} trait ParamClass { def getName: String diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpDesc.scala index 9a1cfd8eb8a..e90903439e2 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpDesc.scala @@ -6,11 +6,11 @@ import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp.oneToOnePhysicalOp import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata._ import edu.uci.ics.texera.workflow.common.operators.map.MapOpDesc -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, Schema} import edu.uci.ics.texera.workflow.common.workflow.{ BroadcastPartition, HashPartition, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpExec.scala index 682939f227a..527a7e16145 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpExec.scala @@ -1,9 +1,8 @@ package edu.uci.ics.texera.workflow.operators.projection import com.google.common.base.Preconditions -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.texera.workflow.common.operators.map.MapOpExec -import edu.uci.ics.texera.workflow.common.tuple.Tuple import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/regex/RegexOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/regex/RegexOpExec.scala index 80d0a9aebf6..c8f0e1d7655 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/regex/RegexOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/regex/RegexOpExec.scala @@ -1,9 +1,9 @@ package edu.uci.ics.texera.workflow.operators.regex +import edu.uci.ics.amber.engine.common.model.tuple.Tuple import java.util.regex.Pattern import edu.uci.ics.texera.workflow.common.operators.filter.FilterOpExec -import edu.uci.ics.texera.workflow.common.tuple.Tuple class RegexOpExec(regex: String, caseInsensitive: Boolean, attributeName: String) extends FilterOpExec { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/reservoirsampling/ReservoirSamplingOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/reservoirsampling/ReservoirSamplingOpDesc.scala index bebabd98edb..51f4cbe12cd 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/reservoirsampling/ReservoirSamplingOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/reservoirsampling/ReservoirSamplingOpDesc.scala @@ -5,11 +5,11 @@ import com.google.common.base.Preconditions import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo import edu.uci.ics.amber.engine.common.AmberConfig +import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.LogicalOp -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema import edu.uci.ics.texera.workflow.operators.util.OperatorDescriptorUtils.equallyPartitionGoal import scala.util.Random diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/reservoirsampling/ReservoirSamplingOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/reservoirsampling/ReservoirSamplingOpExec.scala index 729aba32e44..9e41625596c 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/reservoirsampling/ReservoirSamplingOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/reservoirsampling/ReservoirSamplingOpExec.scala @@ -1,8 +1,7 @@ package edu.uci.ics.texera.workflow.operators.reservoirsampling -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple import scala.util.Random diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sentiment/SentimentAnalysisOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sentiment/SentimentAnalysisOpDesc.scala index 5f31449a84f..9c334197b3c 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sentiment/SentimentAnalysisOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sentiment/SentimentAnalysisOpDesc.scala @@ -4,12 +4,12 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.operators.map.MapOpDesc -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema} @JsonSchemaInject(json = """ { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sentiment/SentimentAnalysisOpExec.java b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sentiment/SentimentAnalysisOpExec.java index 900bdc1dad8..cb2835ac3fa 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sentiment/SentimentAnalysisOpExec.java +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sentiment/SentimentAnalysisOpExec.java @@ -7,9 +7,9 @@ import edu.stanford.nlp.sentiment.SentimentCoreAnnotations; import edu.stanford.nlp.trees.Tree; import edu.stanford.nlp.util.CoreMap; -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike; +import edu.uci.ics.amber.engine.common.model.tuple.TupleLike; import edu.uci.ics.texera.workflow.common.operators.map.MapOpExec; -import edu.uci.ics.texera.workflow.common.tuple.Tuple; +import edu.uci.ics.amber.engine.common.model.tuple.Tuple; import scala.Function1; import java.io.Serializable; diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpDesc.java b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpDesc.java index 900ee307ee4..e31fa8c0167 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpDesc.java +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpDesc.java @@ -5,7 +5,6 @@ import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp; import edu.uci.ics.amber.engine.architecture.deploysemantics.SchemaPropagationFunc; import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo; -import edu.uci.ics.amber.engine.common.AmberRuntime; import edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity; import edu.uci.ics.amber.engine.common.virtualidentity.OperatorIdentity; import edu.uci.ics.amber.engine.common.virtualidentity.WorkflowIdentity; @@ -17,7 +16,7 @@ import edu.uci.ics.texera.workflow.common.metadata.OperatorGroupConstants; import edu.uci.ics.texera.workflow.common.metadata.OperatorInfo; import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor; -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema; +import edu.uci.ics.amber.engine.common.model.tuple.Schema; import edu.uci.ics.texera.workflow.operators.sink.SinkOpDesc; import edu.uci.ics.texera.workflow.operators.sink.storage.SinkStorageReader; import edu.uci.ics.texera.workflow.operators.sink.storage.SinkStorageWriter; diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpExec.scala index 60d1d09c29e..724b35dc5b7 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpExec.scala @@ -1,9 +1,8 @@ package edu.uci.ics.texera.workflow.operators.sink.managed import edu.uci.ics.amber.engine.common.SinkOperatorExecutor -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.texera.workflow.common.IncrementalOutputMode._ -import edu.uci.ics.texera.workflow.common.tuple.Tuple import edu.uci.ics.texera.workflow.common.{IncrementalOutputMode, ProgressiveUtils} import edu.uci.ics.texera.workflow.operators.sink.storage.SinkStorageWriter diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/storage/MemoryStorage.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/storage/MemoryStorage.scala index 0c919b7c7b2..4f8ecd189fa 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/storage/MemoryStorage.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/storage/MemoryStorage.scala @@ -1,7 +1,6 @@ package edu.uci.ics.texera.workflow.operators.sink.storage -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema +import edu.uci.ics.amber.engine.common.model.tuple.{Schema, Tuple} import scala.collection.mutable.ArrayBuffer diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/storage/MongoDBSinkStorage.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/storage/MongoDBSinkStorage.scala index f15e7874360..a1907dd0e88 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/storage/MongoDBSinkStorage.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/storage/MongoDBSinkStorage.scala @@ -3,10 +3,9 @@ package edu.uci.ics.texera.workflow.operators.sink.storage import com.mongodb.client.model.Sorts import com.mongodb.client.MongoCursor import edu.uci.ics.amber.engine.common.AmberConfig +import edu.uci.ics.amber.engine.common.model.tuple.{Schema, Tuple} import edu.uci.ics.texera.web.storage.{MongoCollectionManager, MongoDatabaseManager} -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.TupleUtils.document2Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema +import edu.uci.ics.amber.engine.common.model.tuple.TupleUtils.document2Tuple import org.bson.Document import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/storage/SinkStorageReader.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/storage/SinkStorageReader.scala index d10d755c8b9..e8b8a91a669 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/storage/SinkStorageReader.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/storage/SinkStorageReader.scala @@ -1,7 +1,6 @@ package edu.uci.ics.texera.workflow.operators.sink.storage -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema +import edu.uci.ics.amber.engine.common.model.tuple.{Schema, Tuple} trait SinkStorageReader { var schema: Schema = _ diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/storage/SinkStorageWriter.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/storage/SinkStorageWriter.scala index ce831ae0d03..1d82140bd5a 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/storage/SinkStorageWriter.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/storage/SinkStorageWriter.scala @@ -1,6 +1,6 @@ package edu.uci.ics.texera.workflow.operators.sink.storage -import edu.uci.ics.texera.workflow.common.tuple.Tuple +import edu.uci.ics.amber.engine.common.model.tuple.Tuple trait SinkStorageWriter { def open(): Unit diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sklearn/SklearnMLOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sklearn/SklearnMLOpDesc.scala index cb0dab1d68e..a46ce9dc371 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sklearn/SklearnMLOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sklearn/SklearnMLOpDesc.scala @@ -7,6 +7,7 @@ import com.kjetland.jackson.jsonSchema.annotations.{ JsonSchemaString, JsonSchemaTitle } +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, PortIdentity} import edu.uci.ics.texera.workflow.common.metadata.annotations.{ AutofillAttributeName, @@ -15,7 +16,6 @@ import edu.uci.ics.texera.workflow.common.metadata.annotations.{ } import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema} abstract class SklearnMLOpDesc extends PythonOperatorDescriptor { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sklearn/SklearnPredictionOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sklearn/SklearnPredictionOpDesc.scala index 3f02e8da829..2ae3b50d78f 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sklearn/SklearnPredictionOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sklearn/SklearnPredictionOpDesc.scala @@ -1,11 +1,11 @@ package edu.uci.ics.texera.workflow.operators.sklearn import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, PortIdentity} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema} class SklearnPredictionOpDesc extends PythonOperatorDescriptor { @JsonProperty(value = "Model Attribute", required = true, defaultValue = "model") diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sort/SortOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sort/SortOpDesc.scala index 45c76dcea04..1727160ac90 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sort/SortOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sort/SortOpDesc.scala @@ -1,10 +1,10 @@ package edu.uci.ics.texera.workflow.operators.sort import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} +import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema class SortOpDesc extends PythonOperatorDescriptor { @JsonProperty(required = true) diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionOpExec.scala index f3f800795cd..ba412edffa5 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionOpExec.scala @@ -1,9 +1,7 @@ package edu.uci.ics.texera.workflow.operators.sortPartitions -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Tuple, TupleLike} import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeType import scala.collection.mutable.ArrayBuffer diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionsOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionsOpDesc.scala index f896a8701f4..806e49cfbbd 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionsOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionsOpDesc.scala @@ -5,12 +5,12 @@ import com.google.common.base.Preconditions import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.LogicalOp -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema import edu.uci.ics.texera.workflow.common.workflow.RangePartition @JsonSchemaInject(json = """ diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/reddit/RedditSearchSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/reddit/RedditSearchSourceOpDesc.scala index da1595afb27..c29cb58d95d 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/reddit/RedditSearchSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/reddit/RedditSearchSourceOpDesc.scala @@ -3,13 +3,11 @@ package edu.uci.ics.texera.workflow.operators.source.apis.reddit import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonPropertyDescription import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.OutputPort import edu.uci.ics.texera.workflow.common.metadata.OperatorGroupConstants import edu.uci.ics.texera.workflow.common.metadata.OperatorInfo import edu.uci.ics.texera.workflow.common.operators.source.PythonSourceOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.Attribute -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeType -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema class RedditSearchSourceOpDesc extends PythonSourceOperatorDescriptor { @JsonProperty(required = true) diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala index b9182e20fde..ebc58b82299 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala @@ -8,9 +8,9 @@ import com.kjetland.jackson.jsonSchema.annotations.{ } import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.metadata.annotations.UIWidget -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.operators.source.apis.twitter.TwitterSourceOpDesc class TwitterFullArchiveSearchSourceOpDesc extends TwitterSourceOpDesc { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpExec.scala index 3d854a76c5e..e4940ba1145 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpExec.scala @@ -1,8 +1,6 @@ package edu.uci.ics.texera.workflow.operators.source.apis.twitter.v2 -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema +import edu.uci.ics.amber.engine.common.model.tuple.{Schema, Tuple, TupleLike} import edu.uci.ics.texera.workflow.operators.source.apis.twitter.TwitterSourceOpExec import edu.uci.ics.texera.workflow.operators.source.apis.twitter.v2.TwitterUtils.tweetDataToTuple import io.github.redouane59.twitter.dto.endpoints.AdditionalParameters diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala index a26a64acaa8..a4bceb3daf1 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala @@ -8,9 +8,9 @@ import com.kjetland.jackson.jsonSchema.annotations.{ } import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.metadata.annotations.UIWidget -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.operators.source.apis.twitter.TwitterSourceOpDesc class TwitterSearchSourceOpDesc extends TwitterSourceOpDesc { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterSearchSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterSearchSourceOpExec.scala index 259a29c795d..625967b8e99 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterSearchSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterSearchSourceOpExec.scala @@ -1,8 +1,6 @@ package edu.uci.ics.texera.workflow.operators.source.apis.twitter.v2 -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema +import edu.uci.ics.amber.engine.common.model.tuple.{Schema, Tuple, TupleLike} import edu.uci.ics.texera.workflow.operators.source.apis.twitter.TwitterSourceOpExec import edu.uci.ics.texera.workflow.operators.source.apis.twitter.v2.TwitterUtils.tweetDataToTuple import io.github.redouane59.twitter.dto.endpoints.AdditionalParameters diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterUtils.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterUtils.scala index b9a648c5673..d6d79dcbb2a 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterUtils.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterUtils.scala @@ -1,7 +1,6 @@ package edu.uci.ics.texera.workflow.operators.source.apis.twitter.v2 -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeTypeUtils, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeTypeUtils, Schema, Tuple} import io.github.redouane59.twitter.dto.tweet.TweetV2.TweetData import io.github.redouane59.twitter.dto.user.UserV2.UserData diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/cache/CacheSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/cache/CacheSourceOpDesc.scala index e3c3ec781d5..ced93e97aea 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/cache/CacheSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/cache/CacheSourceOpDesc.scala @@ -2,6 +2,7 @@ package edu.uci.ics.texera.workflow.operators.source.cache import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} +import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ ExecutionIdentity, OperatorIdentity, @@ -11,7 +12,6 @@ import edu.uci.ics.amber.engine.common.workflow.OutputPort import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.source.SourceOperatorDescriptor import edu.uci.ics.texera.workflow.common.storage.OpResultStorage -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema class CacheSourceOpDesc(val targetSinkStorageId: OperatorIdentity, opResultStorage: OpResultStorage) extends SourceOperatorDescriptor { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/cache/CacheSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/cache/CacheSourceOpExec.scala index 0dc062b5868..b872fc1e254 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/cache/CacheSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/cache/CacheSourceOpExec.scala @@ -2,7 +2,7 @@ package edu.uci.ics.texera.workflow.operators.source.cache import com.typesafe.scalalogging.LazyLogging import edu.uci.ics.amber.engine.common.SourceOperatorExecutor -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.TupleLike import edu.uci.ics.texera.workflow.operators.sink.storage.SinkStorageReader class CacheSourceOpExec(storage: SinkStorageReader) diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/fetcher/URLFetcherOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/fetcher/URLFetcherOpDesc.scala index 341a443805e..153d8c73ced 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/fetcher/URLFetcherOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/fetcher/URLFetcherOpDesc.scala @@ -4,11 +4,11 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.OutputPort import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.source.SourceOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema} class URLFetcherOpDesc extends SourceOperatorDescriptor { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/fetcher/URLFetcherOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/fetcher/URLFetcherOpExec.scala index cbdabfe62be..b0803f6fdee 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/fetcher/URLFetcherOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/fetcher/URLFetcherOpExec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.source.fetcher import edu.uci.ics.amber.engine.common.SourceOperatorExecutor -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.TupleLike import edu.uci.ics.texera.workflow.operators.source.fetcher.URLFetchUtil.getInputStreamFromURL import org.apache.commons.io.IOUtils diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/FileAttributeType.java b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/FileAttributeType.java index cd2899d2720..d15c705be4f 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/FileAttributeType.java +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/FileAttributeType.java @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.source.scan; import com.fasterxml.jackson.annotation.JsonValue; -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeType; +import edu.uci.ics.amber.engine.common.model.tuple.AttributeType; public enum FileAttributeType { STRING("string", AttributeType.STRING), diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/FileScanSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/FileScanSourceOpDesc.scala index a2729868c2e..0a897a538b9 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/FileScanSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/FileScanSourceOpDesc.scala @@ -8,9 +8,9 @@ import com.kjetland.jackson.jsonSchema.annotations.{ } import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.metadata.annotations.HideAnnotation -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.operators.source.scan.text.TextSourceOpDesc @JsonIgnoreProperties(value = Array("limit", "offset", "fileEncoding")) diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/FileScanSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/FileScanSourceOpExec.scala index 7e349c37ce3..174e2047cb7 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/FileScanSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/FileScanSourceOpExec.scala @@ -1,9 +1,9 @@ package edu.uci.ics.texera.workflow.operators.source.scan import edu.uci.ics.amber.engine.common.SourceOperatorExecutor +import edu.uci.ics.amber.engine.common.model.tuple.TupleLike import edu.uci.ics.amber.engine.common.storage.DatasetFileDocument -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeTypeUtils.parseField +import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.parseField import org.apache.commons.compress.archivers.{ArchiveInputStream, ArchiveStreamFactory} import org.apache.commons.io.IOUtils.toByteArray diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/ScanSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/ScanSourceOpDesc.scala index b1d130b1bf9..c335cadbac2 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/ScanSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/ScanSourceOpDesc.scala @@ -4,12 +4,12 @@ import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty, JsonPropertyD import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.engine.common.AmberConfig +import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.storage.DatasetFileDocument import edu.uci.ics.amber.engine.common.workflow.OutputPort import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.source.SourceOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema import org.apache.commons.lang3.builder.EqualsBuilder import java.nio.file.Paths diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpDesc.scala index e2cb4a901eb..edd407f6a89 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpDesc.scala @@ -7,8 +7,8 @@ import com.univocity.parsers.csv.{CsvFormat, CsvParser, CsvParserSettings} import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeTypeUtils.inferSchemaFromRows -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.inferSchemaFromRows +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.operators.source.scan.ScanSourceOpDesc import java.io.{File, FileInputStream, IOException, InputStreamReader} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpExec.scala index 59849fb1852..61e6638be0b 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpExec.scala @@ -4,9 +4,8 @@ import com.univocity.parsers.csv.{CsvFormat, CsvParser, CsvParserSettings} import edu.uci.ics.amber.engine.common.workflow.PortIdentity import edu.uci.ics.amber.engine.common.{CheckpointState, CheckpointSupport} import edu.uci.ics.amber.engine.common.SourceOperatorExecutor +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeTypeUtils, Schema, TupleLike} import edu.uci.ics.amber.engine.common.storage.DatasetFileDocument -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeTypeUtils, Schema} import edu.uci.ics.texera.workflow.operators.source.scan.FileDecodingMethod import java.io.InputStreamReader diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/ParallelCSVScanSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/ParallelCSVScanSourceOpDesc.scala index 0a12f9bfd78..6058893ef2a 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/ParallelCSVScanSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/ParallelCSVScanSourceOpDesc.scala @@ -7,8 +7,8 @@ import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeTypeUtils.inferSchemaFromRows -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.inferSchemaFromRows +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.operators.source.scan.ScanSourceOpDesc import java.io.{File, IOException} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/ParallelCSVScanSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/ParallelCSVScanSourceOpExec.scala index b9c596c1bb4..105f9fc2c0e 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/ParallelCSVScanSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/ParallelCSVScanSourceOpExec.scala @@ -1,9 +1,8 @@ package edu.uci.ics.texera.workflow.operators.source.scan.csv import edu.uci.ics.amber.engine.common.SourceOperatorExecutor -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeTypeUtils, Schema, TupleLike} import edu.uci.ics.texera.workflow.common.scanner.BufferedBlockReader -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeTypeUtils, Schema} import org.tukaani.xz.SeekableFileInputStream import java.io.File diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csvOld/CSVOldScanSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csvOld/CSVOldScanSourceOpDesc.scala index 9d0a6104a79..4ea923e833c 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csvOld/CSVOldScanSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csvOld/CSVOldScanSourceOpDesc.scala @@ -7,8 +7,8 @@ import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeTypeUtils.inferSchemaFromRows -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.inferSchemaFromRows +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.operators.source.scan.ScanSourceOpDesc import java.io.{File, IOException} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csvOld/CSVOldScanSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csvOld/CSVOldScanSourceOpExec.scala index fa4b0ddab3c..41165bea74f 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csvOld/CSVOldScanSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csvOld/CSVOldScanSourceOpExec.scala @@ -2,8 +2,7 @@ package edu.uci.ics.texera.workflow.operators.source.scan.csvOld import com.github.tototoshi.csv.{CSVReader, DefaultCSVFormat} import edu.uci.ics.amber.engine.common.SourceOperatorExecutor -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeTypeUtils, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeTypeUtils, Schema, TupleLike} import edu.uci.ics.texera.workflow.operators.source.scan.FileDecodingMethod import scala.collection.compat.immutable.ArraySeq diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/json/JSONLScanSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/json/JSONLScanSourceOpDesc.scala index 2709370e90e..0c409351777 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/json/JSONLScanSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/json/JSONLScanSourceOpDesc.scala @@ -7,8 +7,8 @@ import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInf import edu.uci.ics.amber.engine.common.storage.DatasetFileDocument import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.Utils.objectMapper -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeTypeUtils.inferSchemaFromRows -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.inferSchemaFromRows +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, Schema} import edu.uci.ics.texera.workflow.operators.source.scan.ScanSourceOpDesc import edu.uci.ics.texera.workflow.operators.source.scan.json.JSONUtil.JSONToMap diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/json/JSONLScanSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/json/JSONLScanSourceOpExec.scala index 18652cd0232..5aaf7b29aa9 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/json/JSONLScanSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/json/JSONLScanSourceOpExec.scala @@ -2,10 +2,9 @@ package edu.uci.ics.texera.workflow.operators.source.scan.json import edu.uci.ics.amber.engine.common.SourceOperatorExecutor import edu.uci.ics.amber.engine.common.storage.DatasetFileDocument -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike import edu.uci.ics.texera.Utils.objectMapper -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeTypeUtils.parseField -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema +import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.parseField +import edu.uci.ics.amber.engine.common.model.tuple.{Schema, TupleLike} import edu.uci.ics.texera.workflow.operators.source.scan.FileDecodingMethod import edu.uci.ics.texera.workflow.operators.source.scan.json.JSONUtil.JSONToMap diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/TextInputSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/TextInputSourceOpDesc.scala index fd105f772aa..b2e8fd06078 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/TextInputSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/TextInputSourceOpDesc.scala @@ -4,12 +4,12 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.OutputPort import edu.uci.ics.texera.workflow.common.metadata.annotations.UIWidget import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.source.SourceOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, Schema} class TextInputSourceOpDesc extends SourceOperatorDescriptor with TextSourceOpDesc { @JsonProperty(required = true) diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/TextInputSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/TextInputSourceOpExec.scala index 3ec57227845..0c33c604db5 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/TextInputSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/TextInputSourceOpExec.scala @@ -1,8 +1,8 @@ package edu.uci.ics.texera.workflow.operators.source.scan.text import edu.uci.ics.amber.engine.common.SourceOperatorExecutor -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeTypeUtils.parseField +import edu.uci.ics.amber.engine.common.model.tuple.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.parseField import edu.uci.ics.texera.workflow.operators.source.scan.FileAttributeType class TextInputSourceOpExec private[text] ( diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/SQLSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/SQLSourceOpDesc.scala index 9b9482d4e9e..8232e5b99b4 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/SQLSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/SQLSourceOpDesc.scala @@ -3,6 +3,7 @@ package edu.uci.ics.texera.workflow.operators.source.sql import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.common.metadata.annotations.{ AutofillAttributeName, BatchByColumn, @@ -10,7 +11,6 @@ import edu.uci.ics.texera.workflow.common.metadata.annotations.{ UIWidget } import edu.uci.ics.texera.workflow.common.operators.source.SourceOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import java.sql._ diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/SQLSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/SQLSourceOpExec.scala index 21dd583fc2f..3e5e11907e2 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/SQLSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/SQLSourceOpExec.scala @@ -1,14 +1,11 @@ package edu.uci.ics.texera.workflow.operators.source.sql import edu.uci.ics.amber.engine.common.SourceOperatorExecutor -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeType._ -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeTypeUtils.{ +import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.{ parseField, parseTimestamp } -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, Schema, Tuple, TupleLike} import java.sql._ import scala.collection.mutable.ArrayBuffer diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/asterixdb/AsterixDBSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/asterixdb/AsterixDBSourceOpDesc.scala index 795b42864d8..de03fa46c10 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/asterixdb/AsterixDBSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/asterixdb/AsterixDBSourceOpDesc.scala @@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.OutputPort import edu.uci.ics.texera.workflow.common.metadata.annotations.{ @@ -17,7 +18,6 @@ import edu.uci.ics.texera.workflow.common.metadata.annotations.{ UIWidget } import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.operators.filter.FilterPredicate import edu.uci.ics.texera.workflow.operators.source.sql.SQLSourceOpDesc import edu.uci.ics.texera.workflow.operators.source.sql.asterixdb.AsterixDBConnUtil.{ diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/asterixdb/AsterixDBSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/asterixdb/AsterixDBSourceOpExec.scala index 79b5a2e3aa4..babc756f8fe 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/asterixdb/AsterixDBSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/asterixdb/AsterixDBSourceOpExec.scala @@ -1,11 +1,8 @@ package edu.uci.ics.texera.workflow.operators.source.sql.asterixdb import com.github.tototoshi.csv.CSVParser -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeType._ -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeTypeUtils.parseField -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.parseField +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema, Tuple, TupleLike} import edu.uci.ics.texera.workflow.operators.filter.FilterPredicate import edu.uci.ics.texera.workflow.operators.source.sql.SQLSourceOpExec import edu.uci.ics.texera.workflow.operators.source.sql.asterixdb.AsterixDBConnUtil.{ diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/mysql/MySQLSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/mysql/MySQLSourceOpExec.scala index 7ae2cd7ca16..a9b377ddbd8 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/mysql/MySQLSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/mysql/MySQLSourceOpExec.scala @@ -1,6 +1,6 @@ package edu.uci.ics.texera.workflow.operators.source.sql.mysql -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema} import edu.uci.ics.texera.workflow.operators.source.sql.mysql.MySQLConnUtil.connect import edu.uci.ics.texera.workflow.operators.source.sql.SQLSourceOpExec diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/postgresql/PostgreSQLSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/postgresql/PostgreSQLSourceOpExec.scala index bfd8bf02f94..1e2fab68bb0 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/postgresql/PostgreSQLSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/postgresql/PostgreSQLSourceOpExec.scala @@ -1,6 +1,6 @@ package edu.uci.ics.texera.workflow.operators.source.sql.postgresql -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema} import edu.uci.ics.texera.workflow.operators.source.sql.SQLSourceOpExec import edu.uci.ics.texera.workflow.operators.source.sql.postgresql.PostgreSQLConnUtil.connect diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/split/SplitOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/split/SplitOpDesc.scala index c86af3cc528..dbc46c7386d 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/split/SplitOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/split/SplitOpDesc.scala @@ -4,11 +4,11 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.google.common.base.Preconditions import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, PortIdentity} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.LogicalOp -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema import scala.util.Random diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/split/SplitOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/split/SplitOpExec.scala index b3ed107e6b2..c0f6d9c5108 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/split/SplitOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/split/SplitOpExec.scala @@ -1,9 +1,8 @@ package edu.uci.ics.texera.workflow.operators.split -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.amber.engine.common.workflow.PortIdentity import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple import scala.util.Random diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpDesc.scala index 90cfa8647c4..30e7e471129 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpDesc.scala @@ -3,10 +3,10 @@ package edu.uci.ics.texera.workflow.operators.symmetricDifference import com.google.common.base.Preconditions import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.LogicalOp -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, PortIdentity} import edu.uci.ics.texera.workflow.common.workflow.HashPartition diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpExec.scala index fad72e02610..101325afa62 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpExec.scala @@ -1,8 +1,7 @@ package edu.uci.ics.texera.workflow.operators.symmetricDifference -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpDesc.java b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpDesc.java index a624419b920..8071c76fe33 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpDesc.java +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpDesc.java @@ -6,7 +6,7 @@ import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp; import edu.uci.ics.amber.engine.architecture.deploysemantics.SchemaPropagationFunc; import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo; -import edu.uci.ics.amber.engine.common.AmberRuntime; +import edu.uci.ics.amber.engine.common.tuple.AttributeTypeUtils; import edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity; import edu.uci.ics.amber.engine.common.virtualidentity.WorkflowIdentity; import edu.uci.ics.amber.engine.common.workflow.InputPort; @@ -16,9 +16,9 @@ import edu.uci.ics.texera.workflow.common.metadata.OperatorInfo; import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor; import edu.uci.ics.texera.workflow.common.operators.map.MapOpDesc; -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeTypeUtils; -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema; + +import edu.uci.ics.amber.engine.common.model.tuple.Schema; import edu.uci.ics.texera.workflow.operators.util.OperatorDescriptorUtils; import scala.Tuple2; import scala.collection.immutable.Map; diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpExec.scala index 1fd3ad95b45..208e2909e0c 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpExec.scala @@ -1,9 +1,7 @@ package edu.uci.ics.texera.workflow.operators.typecasting -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeTypeUtils, Tuple, TupleLike} import edu.uci.ics.texera.workflow.common.operators.map.MapOpExec -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeTypeUtils import scala.jdk.CollectionConverters.CollectionHasAsScala diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingUnit.java b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingUnit.java index 030bdf52492..4ad4d04f29a 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingUnit.java +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingUnit.java @@ -5,7 +5,7 @@ import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject; import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle; import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName; -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeType; +import edu.uci.ics.amber.engine.common.model.tuple.AttributeType; @JsonSchemaInject(json = "{" + diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/java/JavaUDFOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/java/JavaUDFOpDesc.scala index d3c4b30c4c9..50c926aa500 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/java/JavaUDFOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/java/JavaUDFOpDesc.scala @@ -5,11 +5,11 @@ import com.google.common.base.Preconditions import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, PortIdentity} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.{LogicalOp, PortDescription, StateTransferFunc} -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, Schema} import edu.uci.ics.texera.workflow.common.workflow.{PartitionInfo, UnknownPartition} import scala.util.{Success, Try} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/DualInputPortsPythonUDFOpDescV2.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/DualInputPortsPythonUDFOpDescV2.scala index 0f8c57f6d6f..af3bd06678c 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/DualInputPortsPythonUDFOpDescV2.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/DualInputPortsPythonUDFOpDescV2.scala @@ -5,10 +5,10 @@ import com.google.common.base.Preconditions import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.LogicalOp -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, Schema} import edu.uci.ics.texera.workflow.common.workflow.UnknownPartition import edu.uci.ics.amber.engine.common.workflow.InputPort import edu.uci.ics.amber.engine.common.workflow.OutputPort diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/LambdaAttributeUnit.java b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/LambdaAttributeUnit.java index f5e2a494dc3..3a136dde8f8 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/LambdaAttributeUnit.java +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/LambdaAttributeUnit.java @@ -7,7 +7,7 @@ import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle; import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeNameLambda; import edu.uci.ics.texera.workflow.common.metadata.annotations.HideAnnotation; -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeType; +import edu.uci.ics.amber.engine.common.model.tuple.AttributeType; import java.util.Objects; diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/PythonLambdaFunctionOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/PythonLambdaFunctionOpDesc.scala index 3408a7f48c0..7c931cd9b64 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/PythonLambdaFunctionOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/PythonLambdaFunctionOpDesc.scala @@ -2,10 +2,10 @@ package edu.uci.ics.texera.workflow.operators.udf.python import com.google.common.base.Preconditions import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeTypeUtils, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeTypeUtils, Schema} class PythonLambdaFunctionOpDesc extends PythonOperatorDescriptor { @JsonSchemaTitle("Add/Modify column(s)") diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/PythonTableReducerOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/PythonTableReducerOpDesc.scala index fb7f82ccaa6..5ab1b92a028 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/PythonTableReducerOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/PythonTableReducerOpDesc.scala @@ -2,10 +2,10 @@ package edu.uci.ics.texera.workflow.operators.udf.python import com.google.common.base.Preconditions import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle +import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema class PythonTableReducerOpDesc extends PythonOperatorDescriptor { @JsonSchemaTitle("Output columns") diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/PythonUDFOpDescV2.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/PythonUDFOpDescV2.scala index a736e23696a..9edf5d6f025 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/PythonUDFOpDescV2.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/PythonUDFOpDescV2.scala @@ -5,10 +5,10 @@ import com.google.common.base.Preconditions import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.{LogicalOp, PortDescription, StateTransferFunc} -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, Schema} import edu.uci.ics.texera.workflow.common.workflow.{PartitionInfo, UnknownPartition} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, PortIdentity} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/source/PythonUDFSourceOpDescV2.java b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/source/PythonUDFSourceOpDescV2.java index f3196d95973..ac9e315414d 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/source/PythonUDFSourceOpDescV2.java +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/source/PythonUDFSourceOpDescV2.java @@ -7,7 +7,6 @@ import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp; import edu.uci.ics.amber.engine.architecture.deploysemantics.SchemaPropagationFunc; import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo; -import edu.uci.ics.amber.engine.common.AmberRuntime; import edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity; import edu.uci.ics.amber.engine.common.virtualidentity.WorkflowIdentity; import edu.uci.ics.amber.engine.common.workflow.InputPort; @@ -16,8 +15,8 @@ import edu.uci.ics.texera.workflow.common.metadata.OperatorGroupConstants; import edu.uci.ics.texera.workflow.common.metadata.OperatorInfo; import edu.uci.ics.texera.workflow.common.operators.source.SourceOperatorDescriptor; -import edu.uci.ics.texera.workflow.common.tuple.schema.Attribute; -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema; +import edu.uci.ics.amber.engine.common.model.tuple.Attribute; +import edu.uci.ics.amber.engine.common.model.tuple.Schema; import edu.uci.ics.texera.workflow.operators.util.OperatorDescriptorUtils; import scala.Option; import scala.collection.immutable.Map; diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/r/RUDFOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/r/RUDFOpDesc.scala index 0045d6ba4d1..19eae408286 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/r/RUDFOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/r/RUDFOpDesc.scala @@ -5,11 +5,11 @@ import com.google.common.base.Preconditions import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, PortIdentity} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.{LogicalOp, PortDescription, StateTransferFunc} -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, Schema} import edu.uci.ics.texera.workflow.common.workflow.{PartitionInfo, UnknownPartition} import scala.util.{Success, Try} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/r/RUDFSourceOpDesc.java b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/r/RUDFSourceOpDesc.java index 65969a62e90..41ab1ca10ed 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/r/RUDFSourceOpDesc.java +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/r/RUDFSourceOpDesc.java @@ -7,7 +7,6 @@ import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp; import edu.uci.ics.amber.engine.architecture.deploysemantics.SchemaPropagationFunc; import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo; -import edu.uci.ics.amber.engine.common.AmberRuntime; import edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity; import edu.uci.ics.amber.engine.common.virtualidentity.WorkflowIdentity; import edu.uci.ics.amber.engine.common.workflow.InputPort; @@ -16,8 +15,8 @@ import edu.uci.ics.texera.workflow.common.metadata.OperatorGroupConstants; import edu.uci.ics.texera.workflow.common.metadata.OperatorInfo; import edu.uci.ics.texera.workflow.common.operators.source.SourceOperatorDescriptor; -import edu.uci.ics.texera.workflow.common.tuple.schema.Attribute; -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema; +import edu.uci.ics.amber.engine.common.model.tuple.Attribute; +import edu.uci.ics.amber.engine.common.model.tuple.Schema; import edu.uci.ics.texera.workflow.operators.util.OperatorDescriptorUtils; import scala.Option; import scala.collection.immutable.Map; diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/union/UnionOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/union/UnionOpDesc.scala index 63f73ef6d70..f1d56641ce4 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/union/UnionOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/union/UnionOpDesc.scala @@ -3,10 +3,10 @@ package edu.uci.ics.texera.workflow.operators.union import com.google.common.base.Preconditions import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.LogicalOp -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, PortIdentity} class UnionOpDesc extends LogicalOp { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/union/UnionOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/union/UnionOpExec.scala index 246cb892f8f..c36870c4095 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/union/UnionOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/union/UnionOpExec.scala @@ -1,8 +1,7 @@ package edu.uci.ics.texera.workflow.operators.union -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple class UnionOpExec extends OperatorExecutor { override def processTuple(tuple: Tuple, port: Int): Iterator[TupleLike] = { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/unneststring/UnnestStringOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/unneststring/UnnestStringOpDesc.scala index bd941a444cf..09ba5717a65 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/unneststring/UnnestStringOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/unneststring/UnnestStringOpDesc.scala @@ -4,11 +4,11 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.google.common.base.Preconditions import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.operators.flatmap.FlatMapOpDesc -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} class UnnestStringOpDesc extends FlatMapOpDesc { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/unneststring/UnnestStringOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/unneststring/UnnestStringOpExec.scala index 060e76e29ab..7d1bf0bb37c 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/unneststring/UnnestStringOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/unneststring/UnnestStringOpExec.scala @@ -1,8 +1,7 @@ package edu.uci.ics.texera.workflow.operators.unneststring -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.texera.workflow.common.operators.flatmap.FlatMapOpExec -import edu.uci.ics.texera.workflow.common.tuple.Tuple class UnnestStringOpExec(attributeName: String, delimiter: String) extends FlatMapOpExec { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/DotPlot/DotPlotOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/DotPlot/DotPlotOpDesc.scala index 415779abd41..529c411226e 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/DotPlot/DotPlotOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/DotPlot/DotPlotOpDesc.scala @@ -2,10 +2,10 @@ package edu.uci.ics.texera.workflow.operators.visualization.DotPlot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/IcicleChart/IcicleChartOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/IcicleChart/IcicleChartOpDesc.scala index dcb0eaf369d..44d02861e3d 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/IcicleChart/IcicleChartOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/IcicleChart/IcicleChartOpDesc.scala @@ -2,11 +2,11 @@ package edu.uci.ics.texera.workflow.operators.visualization.icicleChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, VisualizationOperator diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/ImageViz/ImageVisualizerOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/ImageViz/ImageVisualizerOpDesc.scala index acc39333365..5e0f3730bbd 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/ImageViz/ImageVisualizerOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/ImageViz/ImageVisualizerOpDesc.scala @@ -2,10 +2,10 @@ package edu.uci.ics.texera.workflow.operators.visualization.ImageViz import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/ScatterMatrixChart/ScatterMatrixChartOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/ScatterMatrixChart/ScatterMatrixChartOpDesc.scala index fb3eb977a19..ae4ec634c65 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/ScatterMatrixChart/ScatterMatrixChartOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/ScatterMatrixChart/ScatterMatrixChartOpDesc.scala @@ -2,13 +2,13 @@ package edu.uci.ics.texera.workflow.operators.visualization.ScatterMatrixChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.common.metadata.annotations.{ AutofillAttributeName, AutofillAttributeNameList } import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/barChart/BarChartOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/barChart/BarChartOpDesc.scala index e4f76113de9..4fca4913609 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/barChart/BarChartOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/barChart/BarChartOpDesc.scala @@ -2,10 +2,10 @@ package edu.uci.ics.texera.workflow.operators.visualization.barChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/boxPlot/BoxPlotOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/boxPlot/BoxPlotOpDesc.scala index 46cacae2f7b..7f5b0ec2792 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/boxPlot/BoxPlotOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/boxPlot/BoxPlotOpDesc.scala @@ -2,10 +2,10 @@ package edu.uci.ics.texera.workflow.operators.visualization.boxPlot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/bubbleChart/BubbleChartOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/bubbleChart/BubbleChartOpDesc.scala index 9e7d30e1c20..d6797aaccc8 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/bubbleChart/BubbleChartOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/bubbleChart/BubbleChartOpDesc.scala @@ -3,10 +3,10 @@ package edu.uci.ics.texera.workflow.operators.visualization.bubbleChart import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonPropertyDescription import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/candlestickChart/CandlestickChartOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/candlestickChart/CandlestickChartOpDesc.scala index d9887f53652..79f2aeaf2aa 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/candlestickChart/CandlestickChartOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/candlestickChart/CandlestickChartOpDesc.scala @@ -2,10 +2,10 @@ package edu.uci.ics.texera.workflow.operators.visualization.candlestickChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/continuousErrorBands/ContinuousErrorBandsOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/continuousErrorBands/ContinuousErrorBandsOpDesc.scala index 625d620aa39..1f1d562571d 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/continuousErrorBands/ContinuousErrorBandsOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/continuousErrorBands/ContinuousErrorBandsOpDesc.scala @@ -2,9 +2,9 @@ package edu.uci.ics.texera.workflow.operators.visualization.continuousErrorBands import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/contourPlot/ContourPlotOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/contourPlot/ContourPlotOpDesc.scala index 73e5e8be02a..2e21c2efb9a 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/contourPlot/ContourPlotOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/contourPlot/ContourPlotOpDesc.scala @@ -2,10 +2,10 @@ package edu.uci.ics.texera.workflow.operators.visualization.contourPlot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/dumbbellPlot/DumbbellPlotOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/dumbbellPlot/DumbbellPlotOpDesc.scala index e15ba89b0d1..921dc8688bc 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/dumbbellPlot/DumbbellPlotOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/dumbbellPlot/DumbbellPlotOpDesc.scala @@ -2,10 +2,10 @@ package edu.uci.ics.texera.workflow.operators.visualization.dumbbellPlot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/figureFactoryTable/FigureFactoryTableOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/figureFactoryTable/FigureFactoryTableOpDesc.scala index 0f1781e04b5..37914b18586 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/figureFactoryTable/FigureFactoryTableOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/figureFactoryTable/FigureFactoryTableOpDesc.scala @@ -2,10 +2,10 @@ package edu.uci.ics.texera.workflow.operators.visualization.figureFactoryTable import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, VisualizationOperator diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/filledAreaPlot/FilledAreaPlotOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/filledAreaPlot/FilledAreaPlotOpDesc.scala index dd9d0f8848c..9fd921a9c28 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/filledAreaPlot/FilledAreaPlotOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/filledAreaPlot/FilledAreaPlotOpDesc.scala @@ -2,10 +2,10 @@ package edu.uci.ics.texera.workflow.operators.visualization.filledAreaPlot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/funnelPlot/FunnelPlotOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/funnelPlot/FunnelPlotOpDesc.scala index b9d025b8397..4d7c291e186 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/funnelPlot/FunnelPlotOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/funnelPlot/FunnelPlotOpDesc.scala @@ -2,11 +2,11 @@ package edu.uci.ics.texera.workflow.operators.visualization.funnelPlot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, VisualizationOperator diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/ganttChart/GanttChartOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/ganttChart/GanttChartOpDesc.scala index fed16542050..333248093d9 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/ganttChart/GanttChartOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/ganttChart/GanttChartOpDesc.scala @@ -2,10 +2,10 @@ package edu.uci.ics.texera.workflow.operators.visualization.ganttChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/heatMap/HeatMapOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/heatMap/HeatMapOpDesc.scala index e7354aa12d5..426b0115c37 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/heatMap/HeatMapOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/heatMap/HeatMapOpDesc.scala @@ -2,11 +2,11 @@ package edu.uci.ics.texera.workflow.operators.visualization.heatMap import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, VisualizationOperator diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/hierarchychart/HierarchyChartOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/hierarchychart/HierarchyChartOpDesc.scala index 5670db7aef9..4b179acdf4d 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/hierarchychart/HierarchyChartOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/hierarchychart/HierarchyChartOpDesc.scala @@ -2,10 +2,10 @@ package edu.uci.ics.texera.workflow.operators.visualization.hierarchychart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/histogram/HistogramChartOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/histogram/HistogramChartOpDesc.scala index d80789dd1cc..f301c72f7af 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/histogram/HistogramChartOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/histogram/HistogramChartOpDesc.scala @@ -1,12 +1,12 @@ package edu.uci.ics.texera.workflow.operators.visualization.histogram import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} -import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaTitle} +import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, VisualizationOperator diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpDesc.scala index 8a1e1334cfa..3dce9f2dd85 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpDesc.scala @@ -4,10 +4,10 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpExec.scala index 224a5e6038c..6f7a0f36900 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpExec.scala @@ -1,8 +1,7 @@ package edu.uci.ics.texera.workflow.operators.visualization.htmlviz -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple /** * HTML Visualization operator to render any given HTML code diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/lineChart/LineChartOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/lineChart/LineChartOpDesc.scala index c06966e8c11..f4b9fc20c46 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/lineChart/LineChartOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/lineChart/LineChartOpDesc.scala @@ -2,9 +2,9 @@ package edu.uci.ics.texera.workflow.operators.visualization.lineChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/pieChart/PieChartOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/pieChart/PieChartOpDesc.scala index f1d99e9a3b8..55b89470702 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/pieChart/PieChartOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/pieChart/PieChartOpDesc.scala @@ -2,10 +2,10 @@ package edu.uci.ics.texera.workflow.operators.visualization.pieChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/quiverPlot/QuiverPlotOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/quiverPlot/QuiverPlotOpDesc.scala index 79104c87af6..860eb8ea6d7 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/quiverPlot/QuiverPlotOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/quiverPlot/QuiverPlotOpDesc.scala @@ -2,10 +2,10 @@ package edu.uci.ics.texera.workflow.operators.visualization.quiverPlot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/sankeyDiagram/SankeyDiagramOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/sankeyDiagram/SankeyDiagramOpDesc.scala index 5ff2f7f0651..8aa7b1e8ae0 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/sankeyDiagram/SankeyDiagramOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/sankeyDiagram/SankeyDiagramOpDesc.scala @@ -2,10 +2,10 @@ package edu.uci.ics.texera.workflow.operators.visualization.sankeyDiagram import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/scatter3DChart/Scatter3dChartOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/scatter3DChart/Scatter3dChartOpDesc.scala index 09f342032f7..a7aab0bb3cc 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/scatter3DChart/Scatter3dChartOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/scatter3DChart/Scatter3dChartOpDesc.scala @@ -2,11 +2,11 @@ package edu.uci.ics.texera.workflow.operators.visualization.scatter3DChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, VisualizationOperator diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/scatterplot/ScatterplotOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/scatterplot/ScatterplotOpDesc.scala index 46a47bdef5c..79b0215da2a 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/scatterplot/ScatterplotOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/scatterplot/ScatterplotOpDesc.scala @@ -2,11 +2,11 @@ package edu.uci.ics.texera.workflow.operators.visualization.scatterplot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, VisualizationOperator diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/tablesChart/TablesPlotOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/tablesChart/TablesPlotOpDesc.scala index b677a00e922..1d97826e00f 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/tablesChart/TablesPlotOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/tablesChart/TablesPlotOpDesc.scala @@ -1,9 +1,9 @@ package edu.uci.ics.texera.workflow.operators.visualization.tablesChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/ternaryPlot/TernaryPlotOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/ternaryPlot/TernaryPlotOpDesc.scala index b049b9ff556..34df82fd4d0 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/ternaryPlot/TernaryPlotOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/ternaryPlot/TernaryPlotOpDesc.scala @@ -2,10 +2,10 @@ package edu.uci.ics.texera.workflow.operators.visualization.ternaryPlot import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/urlviz/UrlVizOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/urlviz/UrlVizOpDesc.scala index 48241505039..2ef5be383c8 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/urlviz/UrlVizOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/urlviz/UrlVizOpDesc.scala @@ -4,10 +4,10 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/urlviz/UrlVizOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/urlviz/UrlVizOpExec.scala index f732be5d04c..1a197346182 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/urlviz/UrlVizOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/urlviz/UrlVizOpExec.scala @@ -1,8 +1,7 @@ package edu.uci.ics.texera.workflow.operators.visualization.urlviz -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple /** * URL Visualization operator to render any given URL link diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/waterfallChart/WaterfallOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/waterfallChart/WaterfallOpDesc.scala index 3af2954eebc..13c7fc37707 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/waterfallChart/WaterfallOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/waterfallChart/WaterfallOpDesc.scala @@ -2,9 +2,9 @@ package edu.uci.ics.texera.workflow.operators.visualization.waterfallChart import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.operators.visualization.{ VisualizationConstants, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/wordCloud/WordCloudOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/wordCloud/WordCloudOpDesc.scala index 65f8bcd16ea..edf18d4d726 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/wordCloud/WordCloudOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/wordCloud/WordCloudOpDesc.scala @@ -6,11 +6,11 @@ import com.kjetland.jackson.jsonSchema.annotations.{ JsonSchemaInt, JsonSchemaTitle } +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.PythonOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import edu.uci.ics.texera.workflow.operators.visualization.{ ImageUtility, VisualizationConstants, 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 183079e610f..5dff8d7b8b1 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 @@ -1,9 +1,8 @@ package edu.uci.ics.amber.engine.architecture.messaginglayer import edu.uci.ics.amber.engine.common.ambermessage.{DataFrame, WorkflowFIFOMessage} -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema, TupleLike} import edu.uci.ics.amber.engine.common.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema} 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 5cfdfbf71d3..21516955303 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 @@ -3,7 +3,7 @@ package edu.uci.ics.amber.engine.architecture.messaginglayer import com.softwaremill.macwire.wire import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning import edu.uci.ics.amber.engine.common.ambermessage._ -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema, TupleLike} import edu.uci.ics.amber.engine.common.virtualidentity.{ ActorVirtualIdentity, ChannelIdentity, @@ -12,7 +12,6 @@ import edu.uci.ics.amber.engine.common.virtualidentity.{ } import edu.uci.ics.amber.engine.common.workflow.{PhysicalLink, PortIdentity} import edu.uci.ics.texera.workflow.common.EndOfInputChannel -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema} 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 1028039ac2f..ada159087de 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 @@ -2,9 +2,8 @@ package edu.uci.ics.amber.engine.architecture.messaginglayer 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.engine.common.model.tuple.{Attribute, AttributeType, Schema, Tuple} import edu.uci.ics.amber.engine.common.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} 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/ArrowUtilsSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/pythonworker/ArrowUtilsSpec.scala index c7ee7be302c..27427295eda 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/pythonworker/ArrowUtilsSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/architecture/pythonworker/ArrowUtilsSpec.scala @@ -1,8 +1,7 @@ package edu.uci.ics.amber.engine.architecture.pythonworker -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeTypeUtils.AttributeTypeException -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.AttributeTypeException +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema, Tuple} import org.apache.arrow.memory.{BufferAllocator, RootAllocator} import org.apache.arrow.vector.VectorSchemaRoot import org.apache.arrow.vector.types.pojo.{ArrowType, Field} diff --git a/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 575a9b31e5d..b89fe31c94a 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 @@ -10,14 +10,12 @@ import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.{ import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.PauseHandler.PauseWorker import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.ResumeHandler.ResumeWorker import edu.uci.ics.amber.engine.common.ambermessage.{DataFrame, WorkflowFIFOMessage} +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema, Tuple, TupleLike} 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.tuple.amber.TupleLike import edu.uci.ics.amber.engine.common.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} import edu.uci.ics.amber.engine.common.workflow.PortIdentity import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema} 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 3205a3397be..d43b6712288 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 @@ -7,10 +7,10 @@ import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.OpenExecutor import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerState.READY import edu.uci.ics.amber.engine.common.VirtualIdentityUtils import edu.uci.ics.amber.engine.common.ambermessage.{DataFrame, MarkerFrame, WorkflowFIFOMessage} +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema, Tuple, TupleLike} import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation import edu.uci.ics.amber.engine.common.rpc.AsyncRPCServer.ControlCommand -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER import edu.uci.ics.amber.engine.common.virtualidentity.{ ActorVirtualIdentity, @@ -22,8 +22,6 @@ import edu.uci.ics.amber.engine.common.workflow.PortIdentity import edu.uci.ics.texera.workflow.common.EndOfInputChannel import edu.uci.ics.texera.workflow.common.WorkflowContext.DEFAULT_WORKFLOW_ID import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema} 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 0add0cf1efc..0c31d4d3030 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 @@ -17,9 +17,9 @@ import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.AddPartition import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.AssignPortHandler.AssignPort import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.InitializeExecutorHandler.InitializeExecutor import edu.uci.ics.amber.engine.common.ambermessage.{DataFrame, DataPayload, WorkflowFIFOMessage} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, Tuple, TupleLike} import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER import edu.uci.ics.amber.engine.common.virtualidentity.{ ActorVirtualIdentity, @@ -29,8 +29,6 @@ import edu.uci.ics.amber.engine.common.virtualidentity.{ } import edu.uci.ics.amber.engine.common.workflow.{PhysicalLink, PortIdentity} import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} 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/DataProcessingSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/DataProcessingSpec.scala index 6bdb8865a54..6a8fd938909 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 @@ -13,13 +13,12 @@ import edu.uci.ics.amber.engine.architecture.controller.ControllerEvent.{ import edu.uci.ics.amber.engine.architecture.controller._ import edu.uci.ics.amber.engine.architecture.controller.promisehandlers.StartWorkflowHandler.StartWorkflow import edu.uci.ics.amber.engine.common.client.AmberClient +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Tuple} import edu.uci.ics.amber.engine.common.virtualidentity.OperatorIdentity import edu.uci.ics.amber.engine.common.workflow.PortIdentity import edu.uci.ics.amber.engine.e2e.TestUtils.buildWorkflow import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.COMPLETED import edu.uci.ics.texera.workflow.common.storage.OpResultStorage -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeType import edu.uci.ics.texera.workflow.common.workflow._ import edu.uci.ics.texera.workflow.operators.aggregate.AggregationFunction 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 6b4d3a134c3..756ddba0fc7 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 @@ -15,9 +15,9 @@ import edu.uci.ics.amber.engine.common.ambermessage.{ WorkflowFIFOMessage, WorkflowFIFOMessagePayload } +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema, TupleLike} 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.tuple.amber.TupleLike import edu.uci.ics.amber.engine.common.virtualidentity.{ ActorVirtualIdentity, ChannelIdentity, @@ -26,7 +26,6 @@ import edu.uci.ics.amber.engine.common.virtualidentity.{ } import edu.uci.ics.amber.engine.common.virtualidentity.util.{CONTROLLER, SELF} import edu.uci.ics.amber.engine.common.workflow.{PhysicalLink, PortIdentity} -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema} import org.scalatest.BeforeAndAfterAll import org.scalatest.flatspec.AnyFlatSpecLike diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/storage/MemoryDocumentSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/storage/MemoryDocumentSpec.scala index 1dcb3b6ba03..e7e57b53f42 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/storage/MemoryDocumentSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/storage/MemoryDocumentSpec.scala @@ -1,9 +1,8 @@ package edu.uci.ics.texera.workflow.common.storage +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, Tuple} import edu.uci.ics.amber.engine.common.storage.BufferedItemWriter import edu.uci.ics.amber.engine.common.storage.mongodb.MemoryDocument -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/tuple/TupleSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/tuple/TupleSpec.scala index 672f2561cf3..c9ced93667a 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/tuple/TupleSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/tuple/TupleSpec.scala @@ -1,8 +1,8 @@ package edu.uci.ics.texera.workflow.common.tuple -import edu.uci.ics.texera.workflow.common.tuple.TupleUtils.{json2tuple, tuple2json} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, Tuple, TupleBuildingException} +import edu.uci.ics.amber.engine.common.model.tuple.TupleUtils.{json2tuple, tuple2json} import edu.uci.ics.texera.workflow.common.tuple.exception.TupleBuildingException -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import org.scalatest.flatspec.AnyFlatSpec import java.sql.Timestamp diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/tuple/schema/AttributeTypeUtilsSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/tuple/schema/AttributeTypeUtilsSpec.scala index 12644860e17..97c8259114f 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/tuple/schema/AttributeTypeUtilsSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/tuple/schema/AttributeTypeUtilsSpec.scala @@ -1,7 +1,6 @@ package edu.uci.ics.texera.workflow.common.tuple.schema -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeType._ -import edu.uci.ics.texera.workflow.common.tuple.schema.AttributeTypeUtils.{ +import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.{ inferField, inferSchemaFromRows } diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/workflow/SchemaPropagationSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/workflow/SchemaPropagationSpec.scala index 8b34e4b968f..c034096ba3f 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/workflow/SchemaPropagationSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/workflow/SchemaPropagationSpec.scala @@ -1,6 +1,7 @@ package edu.uci.ics.texera.workflow.common.workflow import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ ExecutionIdentity, OperatorIdentity, @@ -11,7 +12,6 @@ import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.common.metadata.OperatorInfo import edu.uci.ics.texera.workflow.common.operators.LogicalOp import edu.uci.ics.texera.workflow.common.operators.source.SourceOperatorDescriptor -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema} import edu.uci.ics.texera.workflow.operators.sink.SinkOpDesc import org.apache.arrow.util.Preconditions import org.scalatest.BeforeAndAfter diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpExecSpec.scala index 37598983ef6..84ab9905933 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpExecSpec.scala @@ -1,8 +1,6 @@ package edu.uci.ics.texera.workflow.operators.cartesianProduct -import edu.uci.ics.amber.engine.common.tuple.amber.{SchemaEnforceable, TupleLike} -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, SchemaEnforceable, Tuple, TupleLike} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpExecSpec.scala index d5e246d9a88..d52ab007a77 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpExecSpec.scala @@ -1,8 +1,6 @@ package edu.uci.ics.texera.workflow.operators.dictionary -import edu.uci.ics.amber.engine.common.tuple.amber.SchemaEnforceable -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, SchemaEnforceable, Tuple} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpExecSpec.scala index 31a9009ef4d..a77ba37b9a5 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpExecSpec.scala @@ -1,8 +1,6 @@ package edu.uci.ics.texera.workflow.operators.difference -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, Tuple, TupleLike} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpExecSpec.scala index e8b609194d5..23e0ea7641b 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpExecSpec.scala @@ -1,8 +1,6 @@ package edu.uci.ics.texera.workflow.operators.distinct -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, Tuple, TupleLike} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec class DistinctOpExecSpec extends AnyFlatSpec with BeforeAndAfter { diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpExecSpec.scala index fc690dc5f0f..8e1fe816fe9 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpExecSpec.scala @@ -1,12 +1,11 @@ package edu.uci.ics.texera.workflow.operators.download +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, Tuple} import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.common.WorkflowContext.{ DEFAULT_EXECUTION_ID, DEFAULT_WORKFLOW_ID } -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec class BulkDownloaderOpExecSpec extends AnyFlatSpec with BeforeAndAfter { diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/filter/SpecializedFilterOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/filter/SpecializedFilterOpExecSpec.scala index eec1c0d9007..022215c690e 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/filter/SpecializedFilterOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/filter/SpecializedFilterOpExecSpec.scala @@ -1,7 +1,6 @@ package edu.uci.ics.texera.workflow.operators.filter -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, Tuple} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinOpSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinOpSpec.scala index 6fe2d92f245..d91fed3c4a0 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinOpSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinOpSpec.scala @@ -1,8 +1,6 @@ package edu.uci.ics.texera.workflow.operators.hashJoin -import edu.uci.ics.amber.engine.common.tuple.amber.{SchemaEnforceable, TupleLike} -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, SchemaEnforceable, Tuple, TupleLike} import edu.uci.ics.texera.workflow.operators.hashJoin.HashJoinOpDesc.HASH_JOIN_INTERNAL_KEY_NAME import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpExecSpec.scala index ac441e715a9..78858d94fd2 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpExecSpec.scala @@ -1,10 +1,8 @@ package edu.uci.ics.texera.workflow.operators.intersect -import edu.uci.ics.amber.engine.common.tuple.amber.TupleLike +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, Tuple, TupleLike} import edu.uci.ics.amber.engine.common.virtualidentity.{OperatorIdentity, PhysicalOpIdentity} import edu.uci.ics.amber.engine.common.workflow.{PhysicalLink, PortIdentity} -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalOpExecSpec.scala index b652906e41d..13c8d0499a7 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalOpExecSpec.scala @@ -1,10 +1,8 @@ package edu.uci.ics.texera.workflow.operators.intervalJoin -import edu.uci.ics.amber.engine.common.tuple.amber.{SchemaEnforceable, TupleLike} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, SchemaEnforceable, Tuple, TupleLike} import edu.uci.ics.amber.engine.common.virtualidentity.{OperatorIdentity, PhysicalOpIdentity} import edu.uci.ics.amber.engine.common.workflow.{PhysicalLink, PortIdentity} -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpDescSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpDescSpec.scala index 1da8a002402..0f53562552d 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpDescSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpDescSpec.scala @@ -1,6 +1,6 @@ package edu.uci.ics.texera.workflow.operators.projection -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpExecSpec.scala index 02c4f82632b..1f466b1b244 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpExecSpec.scala @@ -1,8 +1,6 @@ package edu.uci.ics.texera.workflow.operators.projection -import edu.uci.ics.amber.engine.common.tuple.amber.SchemaEnforceable -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, SchemaEnforceable, Tuple} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec class ProjectionOpExecSpec extends AnyFlatSpec with BeforeAndAfter { diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionsOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionsOpExecSpec.scala index e85ffca7b76..841405ed48f 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionsOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionsOpExecSpec.scala @@ -1,8 +1,6 @@ package edu.uci.ics.texera.workflow.operators.sortPartitions -import edu.uci.ics.amber.engine.common.tuple.amber.SchemaEnforceable -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, SchemaEnforceable, Tuple} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/fetcher/URLFetcherOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/fetcher/URLFetcherOpExecSpec.scala index cc7048c49ea..0a1e820499e 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/fetcher/URLFetcherOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/fetcher/URLFetcherOpExecSpec.scala @@ -1,6 +1,6 @@ package edu.uci.ics.texera.workflow.operators.source.fetcher -import edu.uci.ics.texera.workflow.common.tuple.schema.Schema +import edu.uci.ics.amber.engine.common.model.tuple.Schema import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpDescSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpDescSpec.scala index 2019732a78c..5af8b0dca09 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpDescSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpDescSpec.scala @@ -1,12 +1,12 @@ package edu.uci.ics.texera.workflow.operators.source.scan.csv +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.PortIdentity import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.common.WorkflowContext.{ DEFAULT_EXECUTION_ID, DEFAULT_WORKFLOW_ID } -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/FileScanSourceOpDescSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/FileScanSourceOpDescSpec.scala index 8debffc3108..c58c61a36e1 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/FileScanSourceOpDescSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/FileScanSourceOpDescSpec.scala @@ -1,8 +1,6 @@ package edu.uci.ics.texera.workflow.operators.source.scan.text -import edu.uci.ics.amber.engine.common.tuple.amber.SchemaEnforceable -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema, SchemaEnforceable, Tuple} import edu.uci.ics.texera.workflow.operators.source.scan.{ FileAttributeType, FileDecodingMethod, diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/TextInputSourceOpDescSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/TextInputSourceOpDescSpec.scala index 798611224f0..6155da4c343 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/TextInputSourceOpDescSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/TextInputSourceOpDescSpec.scala @@ -1,8 +1,6 @@ package edu.uci.ics.texera.workflow.operators.source.scan.text -import edu.uci.ics.amber.engine.common.tuple.amber.SchemaEnforceable -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{AttributeType, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema, SchemaEnforceable, Tuple} import edu.uci.ics.texera.workflow.operators.source.scan.FileAttributeType import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpExecSpec.scala index b3527d855c6..c4a7bb1e782 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpExecSpec.scala @@ -1,8 +1,6 @@ package edu.uci.ics.texera.workflow.operators.symmetricDifference -import edu.uci.ics.amber.engine.common.tuple.amber.{SchemaEnforceable, TupleLike} -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, SchemaEnforceable, Tuple, TupleLike} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpExecSpec.scala index 47fc900c064..0fa43160c96 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpExecSpec.scala @@ -1,8 +1,6 @@ package edu.uci.ics.texera.workflow.operators.typecasting -import edu.uci.ics.amber.engine.common.tuple.amber.SchemaEnforceable -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, SchemaEnforceable, Tuple} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/udf/python/PythonLambdaFunctionOpDescSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/udf/python/PythonLambdaFunctionOpDescSpec.scala index 3ca44eb47c9..8f8272d74ac 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/udf/python/PythonLambdaFunctionOpDescSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/udf/python/PythonLambdaFunctionOpDescSpec.scala @@ -1,6 +1,6 @@ package edu.uci.ics.texera.workflow.operators.udf.python -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/unneststring/UnnestStringOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/unneststring/UnnestStringOpExecSpec.scala index 35e8c3e601f..66f4d02ec74 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/unneststring/UnnestStringOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/unneststring/UnnestStringOpExecSpec.scala @@ -1,9 +1,7 @@ package edu.uci.ics.texera.workflow.operators.unneststring -import edu.uci.ics.amber.engine.common.tuple.amber.SchemaEnforceable +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, SchemaEnforceable, Tuple} import edu.uci.ics.amber.engine.common.workflow.PortIdentity -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpExecSpec.scala index 8760770dc41..22e4ccf4c7e 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpExecSpec.scala @@ -1,8 +1,6 @@ package edu.uci.ics.texera.workflow.operators.visualization.htmlviz -import edu.uci.ics.amber.engine.common.tuple.amber.SchemaEnforceable -import edu.uci.ics.texera.workflow.common.tuple.Tuple -import edu.uci.ics.texera.workflow.common.tuple.schema.{Attribute, AttributeType, Schema} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, SchemaEnforceable, Tuple} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec From 049adb3f2356c2765aa49620d37605212c91bb4c Mon Sep 17 00:00:00 2001 From: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com> Date: Tue, 8 Oct 2024 16:34:00 -0700 Subject: [PATCH 2/7] move other components --- .../architecture/controller/Controller.scala | 3 +- .../controller/ControllerProcessor.scala | 2 +- .../architecture/controller/Workflow.scala | 4 +- .../controller/WorkflowScheduler.scala | 3 +- .../ChannelMarkerHandler.scala | 2 +- .../layer/OpExecInitInfo.scala | 2 +- .../messaginglayer/OutputManager.scala | 2 +- .../pythonworker/PythonProxyClient.scala | 2 +- .../pythonworker/PythonProxyServer.scala | 2 +- .../CostBasedRegionPlanGenerator.scala | 3 +- .../ExpansionGreedyRegionPlanGenerator.scala | 3 +- .../scheduling/RegionPlanGenerator.scala | 3 +- .../resourcePolicies/ResourceAllocator.scala | 3 +- .../partitioners/Partitioner.scala | 2 +- .../architecture/worker/DataProcessor.scala | 4 +- .../architecture/worker/WorkerResult.scala | 2 +- .../managers/SerializationManager.scala | 2 +- .../worker/managers/StatisticsManager.scala | 3 +- .../worker/promisehandlers/StartHandler.scala | 4 +- .../engine}/common/IncrementalOutputMode.java | 2 +- .../engine}/common/ProgressiveUtils.scala | 2 +- .../common/ambermessage/DataPayload.scala | 2 +- .../engine/common/client/AmberClient.scala | 3 +- .../engine/common/client/ClientActor.scala | 3 +- .../common/executor}/OperatorExecutor.scala | 3 +- .../{ => executor}/SinkOperatorExecutor.scala | 3 +- .../SourceOperatorExecutor.scala | 3 +- .../engine/common/model}/Marker.scala | 3 +- .../engine/common/model}/PhysicalPlan.scala | 10 +-- .../common/model}/WorkflowContext.scala | 9 +-- .../ics/texera/web/TexeraWebApplication.scala | 3 +- .../resource/SchemaPropagationResource.scala | 4 +- .../WorkflowCompilationResource.scala | 4 +- .../resource/WorkflowWebsocketResource.scala | 2 +- .../web/service/ExecutionResultService.scala | 5 +- .../web/service/ExecutionStatsService.scala | 2 +- .../ExecutionsMetadataPersistService.scala | 2 +- .../FriesReconfigurationAlgorithm.scala | 2 +- .../service/WorkflowExecutionService.scala | 2 +- .../texera/web/service/WorkflowService.scala | 2 +- .../workflow/common/operators/LogicalOp.scala | 76 +++---------------- .../operators/filter/FilterOpExec.scala | 2 +- .../operators/flatmap/FlatMapOpExec.scala | 2 +- .../common/operators/map/MapOpExec.scala | 2 +- .../common/workflow/LogicalPlan.scala | 2 +- .../common/workflow/WorkflowCompiler.scala | 2 +- .../operators/aggregate/AggregateOpDesc.scala | 3 +- .../operators/aggregate/AggregateOpExec.scala | 2 +- .../CartesianProductOpExec.scala | 2 +- .../difference/DifferenceOpExec.scala | 2 +- .../operators/distinct/DistinctOpExec.scala | 2 +- .../download/BulkDownloaderOpExec.scala | 4 +- .../filter/SpecializedFilterOpDesc.java | 2 +- .../hashJoin/HashJoinBuildOpExec.scala | 2 +- .../operators/hashJoin/HashJoinOpDesc.scala | 3 +- .../hashJoin/HashJoinProbeOpExec.scala | 2 +- .../operators/intersect/IntersectOpExec.scala | 2 +- .../intervalJoin/IntervalJoinOpExec.scala | 2 +- .../operators/limit/LimitOpExec.scala | 2 +- .../ReservoirSamplingOpExec.scala | 2 +- .../sink/managed/ProgressiveSinkOpDesc.java | 6 +- .../sink/managed/ProgressiveSinkOpExec.scala | 6 +- .../sortPartitions/SortPartitionOpExec.scala | 2 +- .../apis/twitter/TwitterSourceOpExec.scala | 3 +- .../source/cache/CacheSourceOpExec.scala | 2 +- .../source/fetcher/URLFetcherOpExec.scala | 2 +- .../source/scan/FileScanSourceOpExec.scala | 2 +- .../source/scan/ScanSourceOpDesc.scala | 2 +- .../source/scan/csv/CSVScanSourceOpExec.scala | 2 +- .../csv/ParallelCSVScanSourceOpExec.scala | 2 +- .../scan/csvOld/CSVOldScanSourceOpExec.scala | 2 +- .../scan/json/JSONLScanSourceOpExec.scala | 2 +- .../scan/text/TextInputSourceOpExec.scala | 2 +- .../source/sql/SQLSourceOpExec.scala | 2 +- .../operators/split/SplitOpExec.scala | 2 +- .../SymmetricDifferenceOpExec.scala | 2 +- .../typecasting/TypeCastingOpDesc.java | 2 +- .../operators/union/UnionOpExec.scala | 2 +- .../visualization/VisualizationOperator.java | 2 +- .../visualization/htmlviz/HtmlVizOpExec.scala | 2 +- .../visualization/urlviz/UrlVizOpExec.scala | 2 +- .../messaginglayer/OutputManagerSpec.scala | 2 +- .../architecture/worker/DPThreadSpec.scala | 2 +- .../worker/DataProcessorSpec.scala | 6 +- .../architecture/worker/WorkerSpec.scala | 2 +- .../uci/ics/amber/engine/e2e/TestUtils.scala | 2 +- .../faulttolerance/CheckpointSpec.scala | 7 +- .../workflow/SchemaPropagationSpec.scala | 2 +- .../download/BulkDownloaderOpExecSpec.scala | 4 +- .../scan/csv/CSVScanSourceOpDescSpec.scala | 4 +- 90 files changed, 124 insertions(+), 198 deletions(-) rename core/amber/src/main/scala/edu/uci/ics/{texera/workflow => amber/engine}/common/IncrementalOutputMode.java (82%) rename core/amber/src/main/scala/edu/uci/ics/{texera/workflow => amber/engine}/common/ProgressiveUtils.scala (97%) rename core/amber/src/main/scala/edu/uci/ics/{texera/workflow/common/operators => amber/engine/common/executor}/OperatorExecutor.scala (90%) rename core/amber/src/main/scala/edu/uci/ics/amber/engine/common/{ => executor}/SinkOperatorExecutor.scala (84%) rename core/amber/src/main/scala/edu/uci/ics/amber/engine/common/{ => executor}/SourceOperatorExecutor.scala (93%) rename core/amber/src/main/scala/edu/uci/ics/{texera/workflow/common => amber/engine/common/model}/Marker.scala (96%) rename core/amber/src/main/scala/edu/uci/ics/{texera/workflow/common/workflow => amber/engine/common/model}/PhysicalPlan.scala (97%) rename core/amber/src/main/scala/edu/uci/ics/{texera/workflow/common => amber/engine/common/model}/WorkflowContext.scala (79%) 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 1370c8a32a4..a7dec1848a8 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 @@ -21,13 +21,12 @@ import edu.uci.ics.amber.engine.common.ambermessage.{ WorkflowFIFOMessage } import edu.uci.ics.amber.engine.architecture.controller.ControllerEvent.ExecutionStatsUpdate +import edu.uci.ics.amber.engine.common.model.{PhysicalPlan, WorkflowContext} import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation import edu.uci.ics.amber.engine.common.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} import edu.uci.ics.amber.engine.common.{AmberConfig, CheckpointState, SerializedState} import edu.uci.ics.amber.engine.common.virtualidentity.util.{CLIENT, CONTROLLER, SELF} -import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.common.storage.OpResultStorage -import edu.uci.ics.texera.workflow.common.workflow.PhysicalPlan import scala.concurrent.duration.DurationInt 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 8e48e7405d5..e103add8d78 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 @@ -11,8 +11,8 @@ 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.engine.common.model.WorkflowContext import edu.uci.ics.amber.engine.common.virtualidentity.ActorVirtualIdentity -import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.common.storage.OpResultStorage class ControllerProcessor( diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/Workflow.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/Workflow.scala index dfe3ebd169c..28886be9c49 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/Workflow.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/Workflow.scala @@ -1,7 +1,7 @@ package edu.uci.ics.amber.engine.architecture.controller -import edu.uci.ics.texera.workflow.common.WorkflowContext -import edu.uci.ics.texera.workflow.common.workflow.{LogicalPlan, PhysicalPlan} +import edu.uci.ics.amber.engine.common.model.{PhysicalPlan, WorkflowContext} +import edu.uci.ics.texera.workflow.common.workflow.LogicalPlan case class Workflow( context: WorkflowContext, 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 251e0696694..96c8eb4d0ff 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 @@ -7,9 +7,8 @@ import edu.uci.ics.amber.engine.architecture.scheduling.{ Schedule } import edu.uci.ics.amber.engine.common.AmberConfig -import edu.uci.ics.texera.workflow.common.WorkflowContext +import edu.uci.ics.amber.engine.common.model.{PhysicalPlan, WorkflowContext} import edu.uci.ics.texera.workflow.common.storage.OpResultStorage -import edu.uci.ics.texera.workflow.common.workflow.PhysicalPlan class WorkflowScheduler(workflowContext: WorkflowContext, opResultStorage: OpResultStorage) extends java.io.Serializable { 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 2112fb16e65..3c1f3faa853 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 @@ -5,6 +5,7 @@ import edu.uci.ics.amber.engine.architecture.controller.ControllerAsyncRPCHandle import edu.uci.ics.amber.engine.architecture.controller.promisehandlers.ChannelMarkerHandler.PropagateChannelMarker import edu.uci.ics.amber.engine.common.VirtualIdentityUtils import edu.uci.ics.amber.engine.common.ambermessage.ChannelMarkerType +import edu.uci.ics.amber.engine.common.model.PhysicalPlan import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation import edu.uci.ics.amber.engine.common.rpc.AsyncRPCServer.ControlCommand import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER @@ -14,7 +15,6 @@ import edu.uci.ics.amber.engine.common.virtualidentity.{ ChannelMarkerIdentity, PhysicalOpIdentity } -import edu.uci.ics.texera.workflow.common.workflow.PhysicalPlan object ChannelMarkerHandler { diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/layer/OpExecInitInfo.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/layer/OpExecInitInfo.scala index 5a72b94db50..5e35d53a2dd 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/layer/OpExecInitInfo.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/layer/OpExecInitInfo.scala @@ -1,6 +1,6 @@ package edu.uci.ics.amber.engine.architecture.deploysemantics.layer -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.texera.workflow.operators.udf.java.JavaRuntimeCompilation object OpExecInitInfo { 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 edab82d3972..828bc2de450 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 @@ -8,11 +8,11 @@ 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.engine.common.model.Marker import edu.uci.ics.amber.engine.common.model.tuple.{FinalizeExecutor, FinalizePort, Schema, SchemaEnforceable, TupleLike} import edu.uci.ics.amber.engine.common.rpc.AsyncRPCServer.ControlCommand import edu.uci.ics.amber.engine.common.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} import edu.uci.ics.amber.engine.common.workflow.{PhysicalLink, PortIdentity} -import edu.uci.ics.texera.workflow.common.Marker 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 848e1d43f7e..b1e16cac5f7 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 @@ -15,10 +15,10 @@ import edu.uci.ics.amber.engine.common.ambermessage.InvocationConvertUtils.{ returnInvocationToV2 } import edu.uci.ics.amber.engine.common.ambermessage._ +import edu.uci.ics.amber.engine.common.model.State import edu.uci.ics.amber.engine.common.model.tuple.{Schema, Tuple} import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.{ControlInvocation, ReturnInvocation} import edu.uci.ics.amber.engine.common.virtualidentity.ActorVirtualIdentity -import edu.uci.ics.texera.workflow.common.State 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 34c9dab9330..21b7716762a 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 @@ -19,8 +19,8 @@ import java.net.ServerSocket import java.util.concurrent.atomic.AtomicInteger import scala.collection.mutable import com.twitter.util.Promise +import edu.uci.ics.amber.engine.common.model.{EndOfInputChannel, StartOfInputChannel, State} import edu.uci.ics.amber.engine.common.model.tuple.Tuple -import edu.uci.ics.texera.workflow.common.{EndOfInputChannel, StartOfInputChannel, State} import java.nio.charset.Charset diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/CostBasedRegionPlanGenerator.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/CostBasedRegionPlanGenerator.scala index fa127431615..48e8c85dd9f 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/CostBasedRegionPlanGenerator.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/CostBasedRegionPlanGenerator.scala @@ -2,11 +2,10 @@ package edu.uci.ics.amber.engine.architecture.scheduling import com.typesafe.scalalogging.LazyLogging import edu.uci.ics.amber.engine.common.AmberConfig +import edu.uci.ics.amber.engine.common.model.{PhysicalPlan, WorkflowContext} import edu.uci.ics.amber.engine.common.virtualidentity.PhysicalOpIdentity import edu.uci.ics.amber.engine.common.workflow.PhysicalLink -import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.common.storage.OpResultStorage -import edu.uci.ics.texera.workflow.common.workflow.PhysicalPlan 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/ExpansionGreedyRegionPlanGenerator.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/ExpansionGreedyRegionPlanGenerator.scala index 98fb45d70eb..b08be7a8f9a 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/ExpansionGreedyRegionPlanGenerator.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/ExpansionGreedyRegionPlanGenerator.scala @@ -2,11 +2,10 @@ package edu.uci.ics.amber.engine.architecture.scheduling import com.typesafe.scalalogging.LazyLogging import edu.uci.ics.amber.engine.common.amberexception.WorkflowRuntimeException +import edu.uci.ics.amber.engine.common.model.{PhysicalPlan, WorkflowContext} import edu.uci.ics.amber.engine.common.virtualidentity.PhysicalOpIdentity import edu.uci.ics.amber.engine.common.workflow.PhysicalLink -import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.common.storage.OpResultStorage -import edu.uci.ics.texera.workflow.common.workflow.PhysicalPlan 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/RegionPlanGenerator.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/RegionPlanGenerator.scala index b98d7d26c76..d316047440a 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/RegionPlanGenerator.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/RegionPlanGenerator.scala @@ -6,11 +6,10 @@ import edu.uci.ics.amber.engine.architecture.scheduling.resourcePolicies.{ DefaultResourceAllocator, ExecutionClusterInfo } +import edu.uci.ics.amber.engine.common.model.{PhysicalPlan, WorkflowContext} import edu.uci.ics.amber.engine.common.virtualidentity.{OperatorIdentity, PhysicalOpIdentity} import edu.uci.ics.amber.engine.common.workflow.PhysicalLink -import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.common.storage.OpResultStorage -import edu.uci.ics.texera.workflow.common.workflow.PhysicalPlan import edu.uci.ics.texera.workflow.operators.sink.managed.ProgressiveSinkOpDesc import edu.uci.ics.texera.workflow.operators.source.cache.CacheSourceOpDesc import org.jgrapht.graph.DirectedAcyclicGraph 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 ebcd61ff96d..966ebf5df66 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 @@ -9,9 +9,10 @@ import edu.uci.ics.amber.engine.architecture.scheduling.config.{ OperatorConfig, ResourceConfig } +import edu.uci.ics.amber.engine.common.model.PhysicalPlan import edu.uci.ics.amber.engine.common.virtualidentity.PhysicalOpIdentity import edu.uci.ics.amber.engine.common.workflow.{PhysicalLink, PortIdentity} -import edu.uci.ics.texera.workflow.common.workflow.{PartitionInfo, PhysicalPlan, UnknownPartition} +import edu.uci.ics.texera.workflow.common.workflow.{PartitionInfo, UnknownPartition} import scala.collection.mutable 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 4664ddecb3e..a43008f1b9a 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 @@ -3,9 +3,9 @@ package edu.uci.ics.amber.engine.architecture.sendsemantics.partitioners 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.engine.common.model.Marker import edu.uci.ics.amber.engine.common.model.tuple.Tuple import edu.uci.ics.amber.engine.common.virtualidentity.ActorVirtualIdentity -import edu.uci.ics.texera.workflow.common.Marker import scala.collection.mutable.ArrayBuffer 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 91f0c924215..0a49f019478 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 @@ -22,14 +22,14 @@ import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerState.{ } import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerStatistics import edu.uci.ics.amber.engine.common.ambermessage._ +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor +import edu.uci.ics.amber.engine.common.model.{EndOfInputChannel, StartOfInputChannel, State} import edu.uci.ics.amber.engine.common.model.tuple.{FinalizeExecutor, FinalizePort, SchemaEnforceable, Tuple, TupleLike} import edu.uci.ics.amber.engine.common.statetransition.WorkerStateManager import edu.uci.ics.amber.engine.common.virtualidentity.util.{CONTROLLER, SELF} import edu.uci.ics.amber.engine.common.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} import edu.uci.ics.amber.engine.common.workflow.PortIdentity import edu.uci.ics.amber.error.ErrorUtils.{mkConsoleMessage, safely} -import edu.uci.ics.texera.workflow.common.{EndOfInputChannel, StartOfInputChannel, State} -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor class DataProcessor( actorId: ActorVirtualIdentity, diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/WorkerResult.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/WorkerResult.scala index 955fe375f46..2280eb4b90d 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/WorkerResult.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/WorkerResult.scala @@ -1,7 +1,7 @@ package edu.uci.ics.amber.engine.architecture.worker +import edu.uci.ics.amber.engine.common.IncrementalOutputMode import edu.uci.ics.amber.engine.common.model.tuple.Tuple -import edu.uci.ics.texera.workflow.common.IncrementalOutputMode case class WorkerResult( outputMode: IncrementalOutputMode, 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 aea31f3ba45..85784b84e1b 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 @@ -2,6 +2,7 @@ package edu.uci.ics.amber.engine.architecture.worker.managers import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo.generateJavaOpExec import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.InitializeExecutorHandler.InitializeExecutor +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.TupleLike import edu.uci.ics.amber.engine.common.{ AmberLogging, @@ -11,7 +12,6 @@ import edu.uci.ics.amber.engine.common.{ } import edu.uci.ics.amber.engine.common.virtualidentity.ActorVirtualIdentity import edu.uci.ics.amber.engine.common.workflow.PortIdentity -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor 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 41c0952b813..9f47679595d 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 @@ -4,9 +4,8 @@ import edu.uci.ics.amber.engine.architecture.worker.statistics.{ PortTupleCountMapping, WorkerStatistics } -import edu.uci.ics.amber.engine.common.SinkOperatorExecutor +import edu.uci.ics.amber.engine.common.executor.{OperatorExecutor, SinkOperatorExecutor} import edu.uci.ics.amber.engine.common.workflow.PortIdentity -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor 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 431705c7c69..294454023d5 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 @@ -4,14 +4,14 @@ import edu.uci.ics.amber.engine.architecture.worker.DataProcessorRPCHandlerIniti import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.StartHandler.StartWorker import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerState import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerState.{READY, RUNNING} -import edu.uci.ics.amber.engine.common.SourceOperatorExecutor import edu.uci.ics.amber.engine.common.amberexception.WorkflowRuntimeException import edu.uci.ics.amber.engine.common.ambermessage.MarkerFrame +import edu.uci.ics.amber.engine.common.executor.SourceOperatorExecutor +import edu.uci.ics.amber.engine.common.model.{EndOfInputChannel, StartOfInputChannel} import edu.uci.ics.amber.engine.common.rpc.AsyncRPCServer.ControlCommand import edu.uci.ics.amber.engine.common.virtualidentity.ChannelIdentity import edu.uci.ics.amber.engine.common.virtualidentity.util.SOURCE_STARTER_ACTOR import edu.uci.ics.amber.engine.common.workflow.PortIdentity -import edu.uci.ics.texera.workflow.common.{EndOfInputChannel, StartOfInputChannel} object StartHandler { final case class StartWorker() extends ControlCommand[WorkerState] diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/IncrementalOutputMode.java b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/IncrementalOutputMode.java similarity index 82% rename from core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/IncrementalOutputMode.java rename to core/amber/src/main/scala/edu/uci/ics/amber/engine/common/IncrementalOutputMode.java index c24621ab6f9..e12dd5facbe 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/IncrementalOutputMode.java +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/IncrementalOutputMode.java @@ -1,4 +1,4 @@ -package edu.uci.ics.texera.workflow.common; +package edu.uci.ics.amber.engine.common; public enum IncrementalOutputMode { // sink outputs complete result set snapshot for each update diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/ProgressiveUtils.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ProgressiveUtils.scala similarity index 97% rename from core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/ProgressiveUtils.scala rename to core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ProgressiveUtils.scala index e173adaa285..e742d3b3f93 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/ProgressiveUtils.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ProgressiveUtils.scala @@ -1,4 +1,4 @@ -package edu.uci.ics.texera.workflow.common +package edu.uci.ics.amber.engine.common import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, Tuple} diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/DataPayload.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/DataPayload.scala index c64e990e9ed..94d67814520 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/DataPayload.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/ambermessage/DataPayload.scala @@ -1,7 +1,7 @@ package edu.uci.ics.amber.engine.common.ambermessage +import edu.uci.ics.amber.engine.common.model.Marker import edu.uci.ics.amber.engine.common.model.tuple.Tuple -import edu.uci.ics.texera.workflow.common.Marker sealed trait DataPayload extends WorkflowFIFOMessagePayload {} diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/client/AmberClient.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/client/AmberClient.scala index 3e8e31e0dad..1f352c28e77 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/client/AmberClient.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/client/AmberClient.scala @@ -13,11 +13,10 @@ import edu.uci.ics.amber.engine.common.client.ClientActor.{ InitializeRequest, ObservableRequest } +import edu.uci.ics.amber.engine.common.model.{PhysicalPlan, WorkflowContext} import edu.uci.ics.amber.engine.common.rpc.AsyncRPCServer.ControlCommand import edu.uci.ics.amber.engine.common.virtualidentity.util.CLIENT -import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.common.storage.OpResultStorage -import edu.uci.ics.texera.workflow.common.workflow.PhysicalPlan import io.reactivex.rxjava3.core.Observable import io.reactivex.rxjava3.disposables.Disposable import io.reactivex.rxjava3.subjects.PublishSubject 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 654bde34951..33d595a74df 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 @@ -25,12 +25,11 @@ import edu.uci.ics.amber.engine.common.client.ClientActor.{ InitializeRequest, ObservableRequest } +import edu.uci.ics.amber.engine.common.model.{PhysicalPlan, WorkflowContext} import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.{ControlInvocation, ReturnInvocation} import edu.uci.ics.amber.engine.common.rpc.AsyncRPCServer.ControlCommand import edu.uci.ics.amber.engine.common.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} -import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.common.storage.OpResultStorage -import edu.uci.ics.texera.workflow.common.workflow.PhysicalPlan import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/OperatorExecutor.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/executor/OperatorExecutor.scala similarity index 90% rename from core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/OperatorExecutor.scala rename to core/amber/src/main/scala/edu/uci/ics/amber/engine/common/executor/OperatorExecutor.scala index d6119d93d47..928bfdef618 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/OperatorExecutor.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/executor/OperatorExecutor.scala @@ -1,8 +1,7 @@ -package edu.uci.ics.texera.workflow.common.operators +package edu.uci.ics.amber.engine.common.executor import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.amber.engine.common.workflow.PortIdentity -import edu.uci.ics.texera.workflow.common.State trait OperatorExecutor { diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/SinkOperatorExecutor.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/executor/SinkOperatorExecutor.scala similarity index 84% rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/SinkOperatorExecutor.scala rename to core/amber/src/main/scala/edu/uci/ics/amber/engine/common/executor/SinkOperatorExecutor.scala index 9430a74ea30..4179b933e8b 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/SinkOperatorExecutor.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/executor/SinkOperatorExecutor.scala @@ -1,8 +1,7 @@ -package edu.uci.ics.amber.engine.common +package edu.uci.ics.amber.engine.common.executor import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.amber.engine.common.workflow.PortIdentity -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor trait SinkOperatorExecutor extends OperatorExecutor { diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/SourceOperatorExecutor.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/executor/SourceOperatorExecutor.scala similarity index 93% rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/common/SourceOperatorExecutor.scala rename to core/amber/src/main/scala/edu/uci/ics/amber/engine/common/executor/SourceOperatorExecutor.scala index 5b426ff37de..baff229db0b 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/SourceOperatorExecutor.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/executor/SourceOperatorExecutor.scala @@ -1,9 +1,8 @@ -package edu.uci.ics.amber.engine.common +package edu.uci.ics.amber.engine.common.executor import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.amber.engine.common.storage.DatasetFileDocument import edu.uci.ics.amber.engine.common.workflow.PortIdentity -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor import java.io.{FileInputStream, InputStream} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/Marker.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/Marker.scala similarity index 96% rename from core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/Marker.scala rename to core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/Marker.scala index e422634ff39..78b68d301ef 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/Marker.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/Marker.scala @@ -1,6 +1,7 @@ -package edu.uci.ics.texera.workflow.common +package edu.uci.ics.amber.engine.common.model import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, Tuple} + import scala.collection.mutable sealed trait Marker diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/PhysicalPlan.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/PhysicalPlan.scala similarity index 97% rename from core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/PhysicalPlan.scala rename to core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/PhysicalPlan.scala index b168c82a6b2..fcc9a02425c 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/PhysicalPlan.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/PhysicalPlan.scala @@ -1,16 +1,12 @@ -package edu.uci.ics.texera.workflow.common.workflow +package edu.uci.ics.amber.engine.common.model import com.fasterxml.jackson.annotation.JsonIgnore import com.typesafe.scalalogging.LazyLogging import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.common.VirtualIdentityUtils -import edu.uci.ics.amber.engine.common.virtualidentity.{ - ActorVirtualIdentity, - OperatorIdentity, - PhysicalOpIdentity -} +import edu.uci.ics.amber.engine.common.virtualidentity.{ActorVirtualIdentity, OperatorIdentity, PhysicalOpIdentity} import edu.uci.ics.amber.engine.common.workflow.PhysicalLink -import edu.uci.ics.texera.workflow.common.WorkflowContext +import edu.uci.ics.texera.workflow.common.workflow.{LogicalPlan, PartitionInfo, UnknownPartition} import org.jgrapht.alg.connectivity.BiconnectivityInspector import org.jgrapht.alg.shortestpath.AllDirectedPaths import org.jgrapht.graph.DirectedAcyclicGraph diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/WorkflowContext.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/WorkflowContext.scala similarity index 79% rename from core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/WorkflowContext.scala rename to core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/WorkflowContext.scala index 98379e20a77..28f697b5fd4 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/WorkflowContext.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/WorkflowContext.scala @@ -1,12 +1,7 @@ -package edu.uci.ics.texera.workflow.common +package edu.uci.ics.amber.engine.common.model + import edu.uci.ics.amber.engine.common.AmberConfig import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.texera.workflow.common.WorkflowContext.{ - DEFAULT_EXECUTION_ID, - DEFAULT_WORKFLOW_ID, - DEFAULT_WORKFLOW_SETTINGS -} - import edu.uci.ics.texera.workflow.common.workflow.WorkflowSettings object WorkflowContext { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWebApplication.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWebApplication.scala index 6a343bd4c9a..a0319dea0b7 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWebApplication.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWebApplication.scala @@ -9,6 +9,7 @@ import edu.uci.ics.amber.engine.architecture.controller.ControllerConfig import edu.uci.ics.amber.engine.common.AmberRuntime.scheduleRecurringCallThroughActorSystem import edu.uci.ics.amber.engine.common.{AmberConfig, AmberRuntime} import edu.uci.ics.amber.engine.common.client.AmberClient +import edu.uci.ics.amber.engine.common.model.{PhysicalPlan, WorkflowContext} import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage import edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity import edu.uci.ics.texera.Utils @@ -54,9 +55,7 @@ import edu.uci.ics.texera.web.resource.languageserver.PythonLanguageServerManage import edu.uci.ics.texera.web.service.ExecutionsMetadataPersistService import edu.uci.ics.texera.web.storage.MongoDatabaseManager import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.{COMPLETED, FAILED} -import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.common.storage.OpResultStorage -import edu.uci.ics.texera.workflow.common.workflow.PhysicalPlan import io.dropwizard.auth.{AuthDynamicFeature, AuthValueFactoryProvider} import io.dropwizard.setup.{Bootstrap, Environment} import io.dropwizard.websockets.WebsocketBundle diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/SchemaPropagationResource.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/SchemaPropagationResource.scala index cfdc11c540a..38733e37c83 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/SchemaPropagationResource.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/SchemaPropagationResource.scala @@ -1,12 +1,12 @@ package edu.uci.ics.texera.web.resource import com.typesafe.scalalogging.LazyLogging +import edu.uci.ics.amber.engine.common.model.{PhysicalPlan, WorkflowContext} import edu.uci.ics.amber.engine.common.virtualidentity.WorkflowIdentity import edu.uci.ics.texera.Utils import edu.uci.ics.texera.web.auth.SessionUser import edu.uci.ics.texera.web.model.http.response.SchemaPropagationResponse import edu.uci.ics.texera.web.model.websocket.request.LogicalPlanPojo -import edu.uci.ics.texera.workflow.common.WorkflowContext -import edu.uci.ics.texera.workflow.common.workflow.{LogicalPlan, PhysicalPlan} +import edu.uci.ics.texera.workflow.common.workflow.LogicalPlan import io.dropwizard.auth.Auth import org.jooq.types.UInteger diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/WorkflowCompilationResource.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/WorkflowCompilationResource.scala index 4fcbb891d19..7c314ec5fe5 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/WorkflowCompilationResource.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/WorkflowCompilationResource.scala @@ -1,11 +1,11 @@ package edu.uci.ics.texera.web.resource import com.typesafe.scalalogging.LazyLogging +import edu.uci.ics.amber.engine.common.model.{PhysicalPlan, WorkflowContext} import edu.uci.ics.amber.engine.common.model.tuple.Attribute import edu.uci.ics.amber.engine.common.virtualidentity.WorkflowIdentity import edu.uci.ics.texera.web.model.websocket.request.LogicalPlanPojo -import edu.uci.ics.texera.workflow.common.WorkflowContext -import edu.uci.ics.texera.workflow.common.workflow.{PhysicalPlan, WorkflowCompiler} +import edu.uci.ics.texera.workflow.common.workflow.WorkflowCompiler import org.jooq.types.UInteger import javax.annotation.security.RolesAllowed 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 8519906f5e7..7fdcd83ba0d 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 @@ -3,6 +3,7 @@ package edu.uci.ics.texera.web.resource import com.google.protobuf.timestamp.Timestamp import com.typesafe.scalalogging.LazyLogging import edu.uci.ics.amber.clustering.ClusterListener +import edu.uci.ics.amber.engine.common.model.WorkflowContext import edu.uci.ics.amber.engine.common.virtualidentity.WorkflowIdentity import edu.uci.ics.amber.error.ErrorUtils.getStackTraceWithAllCauses import edu.uci.ics.texera.Utils.objectMapper @@ -20,7 +21,6 @@ import edu.uci.ics.texera.web.workflowruntimestate.FatalErrorType.COMPILATION_ER import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.{PAUSED, RUNNING} import edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError import edu.uci.ics.texera.web.{ServletAwareConfigurator, SessionState} -import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.common.workflow.WorkflowCompiler import java.time.Instant 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 525ab311317..b021727f2f5 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 @@ -8,11 +8,11 @@ import edu.uci.ics.amber.engine.architecture.controller.ControllerEvent.{ ExecutionStateUpdate, FatalError } -import edu.uci.ics.amber.engine.common.{AmberConfig, AmberRuntime} +import edu.uci.ics.amber.engine.common.{AmberConfig, AmberRuntime, IncrementalOutputMode} import edu.uci.ics.amber.engine.common.client.AmberClient import edu.uci.ics.amber.engine.common.model.tuple.Tuple import edu.uci.ics.amber.engine.common.virtualidentity.OperatorIdentity -import edu.uci.ics.texera.workflow.common.IncrementalOutputMode.{SET_DELTA, SET_SNAPSHOT} +import edu.uci.ics.amber.engine.common.IncrementalOutputMode.{SET_DELTA, SET_SNAPSHOT} import edu.uci.ics.texera.web.model.websocket.event.{ PaginatedResultEvent, TexeraWebSocketEvent, @@ -34,7 +34,6 @@ import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.{ RUNNING } import edu.uci.ics.texera.web.SubscriptionManager -import edu.uci.ics.texera.workflow.common.IncrementalOutputMode import edu.uci.ics.texera.workflow.common.storage.OpResultStorage import edu.uci.ics.texera.workflow.common.workflow.LogicalPlan import edu.uci.ics.texera.workflow.operators.sink.managed.ProgressiveSinkOpDesc 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 de06103c7bf..2739f4e0bd1 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 @@ -11,6 +11,7 @@ import edu.uci.ics.amber.engine.architecture.controller.ControllerEvent.{ import edu.uci.ics.amber.engine.architecture.worker.statistics.PortTupleCountMapping import edu.uci.ics.amber.engine.common.AmberConfig import edu.uci.ics.amber.engine.common.client.AmberClient +import edu.uci.ics.amber.engine.common.model.WorkflowContext import edu.uci.ics.amber.error.ErrorUtils.{getOperatorFromActorIdOpt, getStackTraceWithAllCauses} import edu.uci.ics.texera.Utils import edu.uci.ics.texera.Utils.maptoStatusCode @@ -36,7 +37,6 @@ import edu.uci.ics.texera.web.workflowruntimestate.{ import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.FAILED import java.time.Instant -import edu.uci.ics.texera.workflow.common.WorkflowContext import org.jooq.types.{UInteger, ULong} import java.util 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 06ef48ae295..618f2aa619f 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 @@ -7,7 +7,7 @@ import edu.uci.ics.texera.web.SqlServer import edu.uci.ics.texera.web.model.jooq.generated.tables.daos.WorkflowExecutionsDao import edu.uci.ics.texera.web.model.jooq.generated.tables.pojos.WorkflowExecutions import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowVersionResource._ -import edu.uci.ics.texera.workflow.common.WorkflowContext.DEFAULT_EXECUTION_ID +import edu.uci.ics.amber.engine.common.model.WorkflowContext.DEFAULT_EXECUTION_ID import org.jooq.types.UInteger import java.sql.Timestamp 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 bf0b88b3747..9cacb793245 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 @@ -8,9 +8,9 @@ import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.UpdateExecut UpdateMultipleExecutors } import edu.uci.ics.amber.engine.common.ambermessage.RequireAlignment +import edu.uci.ics.amber.engine.common.model.PhysicalPlan import edu.uci.ics.amber.engine.common.virtualidentity.{ChannelMarkerIdentity, PhysicalOpIdentity} import edu.uci.ics.texera.workflow.common.operators.StateTransferFunc -import edu.uci.ics.texera.workflow.common.workflow.PhysicalPlan import org.jgrapht.alg.connectivity.ConnectivityInspector import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowExecutionService.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowExecutionService.scala index b35a403de49..56b15f956d2 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowExecutionService.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowExecutionService.scala @@ -4,6 +4,7 @@ import com.typesafe.scalalogging.LazyLogging import edu.uci.ics.amber.engine.architecture.controller.promisehandlers.StartWorkflowHandler.StartWorkflow import edu.uci.ics.amber.engine.architecture.controller.{ControllerConfig, Workflow} import edu.uci.ics.amber.engine.common.client.AmberClient +import edu.uci.ics.amber.engine.common.model.WorkflowContext import edu.uci.ics.texera.Utils import edu.uci.ics.texera.web.model.websocket.event.{ TexeraWebSocketEvent, @@ -20,7 +21,6 @@ import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.{ READY } import edu.uci.ics.texera.web.{SubscriptionManager, TexeraWebApplication, WebsocketInput} -import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.common.workflow.{LogicalPlan, WorkflowCompiler} import scala.collection.mutable 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 28f1c9702a8..be297674628 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 @@ -9,6 +9,7 @@ import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.{ } import edu.uci.ics.amber.engine.common.AmberConfig import edu.uci.ics.amber.engine.common.amberexception.WorkflowRuntimeException +import edu.uci.ics.amber.engine.common.model.WorkflowContext import edu.uci.ics.amber.engine.common.virtualidentity.{ ChannelMarkerIdentity, ExecutionIdentity, @@ -24,7 +25,6 @@ import edu.uci.ics.texera.web.workflowruntimestate.FatalErrorType.EXECUTION_FAIL import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.{COMPLETED, FAILED} import edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError import edu.uci.ics.texera.web.{SubscriptionManager, WorkflowLifecycleManager} -import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.common.storage.OpResultStorage import edu.uci.ics.texera.workflow.common.workflow.LogicalPlan import io.reactivex.rxjava3.disposables.{CompositeDisposable, Disposable} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/LogicalOp.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/LogicalOp.scala index 3b78a6b788d..f55c5956d55 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/LogicalOp.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/LogicalOp.scala @@ -1,26 +1,16 @@ package edu.uci.ics.texera.workflow.common.operators import com.fasterxml.jackson.annotation.JsonSubTypes.Type -import com.fasterxml.jackson.annotation.{ - JsonIgnore, - JsonProperty, - JsonPropertyDescription, - JsonSubTypes, - JsonTypeInfo -} +import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty, JsonPropertyDescription, JsonSubTypes, JsonTypeInfo} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor +import edu.uci.ics.amber.engine.common.model.{PhysicalPlan, WorkflowContext} import edu.uci.ics.amber.engine.common.model.tuple.Schema -import edu.uci.ics.amber.engine.common.virtualidentity.{ - ExecutionIdentity, - OperatorIdentity, - WorkflowIdentity -} +import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, OperatorIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.PortIdentity import edu.uci.ics.texera.web.OPversion import edu.uci.ics.texera.workflow.common.metadata.{OperatorInfo, PropertyNameConstants} -import edu.uci.ics.texera.workflow.common.workflow.PhysicalPlan -import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.operators.aggregate.AggregateOpDesc import edu.uci.ics.texera.workflow.operators.cartesianProduct.CartesianProductOpDesc import edu.uci.ics.texera.workflow.operators.dictionary.DictionaryMatcherOpDesc @@ -34,16 +24,8 @@ import edu.uci.ics.texera.workflow.operators.intersect.IntersectOpDesc import edu.uci.ics.texera.workflow.operators.intervalJoin.IntervalJoinOpDesc import edu.uci.ics.texera.workflow.operators.keywordSearch.KeywordSearchOpDesc import edu.uci.ics.texera.workflow.operators.limit.LimitOpDesc -import edu.uci.ics.texera.workflow.operators.huggingFace.{ - HuggingFaceIrisLogisticRegressionOpDesc, - HuggingFaceSentimentAnalysisOpDesc, - HuggingFaceSpamSMSDetectionOpDesc, - HuggingFaceTextSummarizationOpDesc -} -import edu.uci.ics.texera.workflow.operators.machineLearning.sklearnAdvanced.KNNTrainer.{ - SklearnAdvancedKNNClassifierTrainerOpDesc, - SklearnAdvancedKNNRegressorTrainerOpDesc -} +import edu.uci.ics.texera.workflow.operators.huggingFace.{HuggingFaceIrisLogisticRegressionOpDesc, HuggingFaceSentimentAnalysisOpDesc, HuggingFaceSpamSMSDetectionOpDesc, HuggingFaceTextSummarizationOpDesc} +import edu.uci.ics.texera.workflow.operators.machineLearning.sklearnAdvanced.KNNTrainer.{SklearnAdvancedKNNClassifierTrainerOpDesc, SklearnAdvancedKNNRegressorTrainerOpDesc} import edu.uci.ics.texera.workflow.operators.machineLearning.sklearnAdvanced.SVCTrainer.SklearnAdvancedSVCTrainerOpDesc import edu.uci.ics.texera.workflow.operators.machineLearning.sklearnAdvanced.SVRTrainer.SVCTrainer.SklearnAdvancedSVRTrainerOpDesc import edu.uci.ics.texera.workflow.operators.projection.ProjectionOpDesc @@ -52,42 +34,11 @@ import edu.uci.ics.texera.workflow.operators.regex.RegexOpDesc import edu.uci.ics.texera.workflow.operators.reservoirsampling.ReservoirSamplingOpDesc import edu.uci.ics.texera.workflow.operators.sentiment.SentimentAnalysisOpDesc import edu.uci.ics.texera.workflow.operators.sink.managed.ProgressiveSinkOpDesc -import edu.uci.ics.texera.workflow.operators.sklearn.{ - SklearnAdaptiveBoostingOpDesc, - SklearnBaggingOpDesc, - SklearnBernoulliNaiveBayesOpDesc, - SklearnComplementNaiveBayesOpDesc, - SklearnDecisionTreeOpDesc, - SklearnDummyClassifierOpDesc, - SklearnExtraTreeOpDesc, - SklearnExtraTreesOpDesc, - SklearnGaussianNaiveBayesOpDesc, - SklearnGradientBoostingOpDesc, - SklearnKNNOpDesc, - SklearnLinearRegressionOpDesc, - SklearnLinearSVMOpDesc, - SklearnLogisticRegressionCVOpDesc, - SklearnLogisticRegressionOpDesc, - SklearnMultiLayerPerceptronOpDesc, - SklearnMultinomialNaiveBayesOpDesc, - SklearnNearestCentroidOpDesc, - SklearnPassiveAggressiveOpDesc, - SklearnPerceptronOpDesc, - SklearnPredictionOpDesc, - SklearnProbabilityCalibrationOpDesc, - SklearnRandomForestOpDesc, - SklearnRidgeCVOpDesc, - SklearnRidgeOpDesc, - SklearnSDGOpDesc, - SklearnSVMOpDesc -} +import edu.uci.ics.texera.workflow.operators.sklearn.{SklearnAdaptiveBoostingOpDesc, SklearnBaggingOpDesc, SklearnBernoulliNaiveBayesOpDesc, SklearnComplementNaiveBayesOpDesc, SklearnDecisionTreeOpDesc, SklearnDummyClassifierOpDesc, SklearnExtraTreeOpDesc, SklearnExtraTreesOpDesc, SklearnGaussianNaiveBayesOpDesc, SklearnGradientBoostingOpDesc, SklearnKNNOpDesc, SklearnLinearRegressionOpDesc, SklearnLinearSVMOpDesc, SklearnLogisticRegressionCVOpDesc, SklearnLogisticRegressionOpDesc, SklearnMultiLayerPerceptronOpDesc, SklearnMultinomialNaiveBayesOpDesc, SklearnNearestCentroidOpDesc, SklearnPassiveAggressiveOpDesc, SklearnPerceptronOpDesc, SklearnPredictionOpDesc, SklearnProbabilityCalibrationOpDesc, SklearnRandomForestOpDesc, SklearnRidgeCVOpDesc, SklearnRidgeOpDesc, SklearnSDGOpDesc, SklearnSVMOpDesc} import edu.uci.ics.texera.workflow.operators.sort.SortOpDesc import edu.uci.ics.texera.workflow.operators.sortPartitions.SortPartitionsOpDesc import edu.uci.ics.texera.workflow.operators.source.apis.reddit.RedditSearchSourceOpDesc -import edu.uci.ics.texera.workflow.operators.source.apis.twitter.v2.{ - TwitterFullArchiveSearchSourceOpDesc, - TwitterSearchSourceOpDesc -} +import edu.uci.ics.texera.workflow.operators.source.apis.twitter.v2.{TwitterFullArchiveSearchSourceOpDesc, TwitterSearchSourceOpDesc} import edu.uci.ics.texera.workflow.operators.source.fetcher.URLFetcherOpDesc import edu.uci.ics.texera.workflow.operators.source.scan.FileScanSourceOpDesc import edu.uci.ics.texera.workflow.operators.source.scan.csv.CSVScanSourceOpDesc @@ -102,12 +53,7 @@ import edu.uci.ics.texera.workflow.operators.symmetricDifference.SymmetricDiffer import edu.uci.ics.texera.workflow.operators.typecasting.TypeCastingOpDesc import edu.uci.ics.texera.workflow.operators.udf.java.JavaUDFOpDesc import edu.uci.ics.texera.workflow.operators.udf.python.source.PythonUDFSourceOpDescV2 -import edu.uci.ics.texera.workflow.operators.udf.python.{ - DualInputPortsPythonUDFOpDescV2, - PythonLambdaFunctionOpDesc, - PythonTableReducerOpDesc, - PythonUDFOpDescV2 -} +import edu.uci.ics.texera.workflow.operators.udf.python.{DualInputPortsPythonUDFOpDescV2, PythonLambdaFunctionOpDesc, PythonTableReducerOpDesc, PythonUDFOpDescV2} import edu.uci.ics.texera.workflow.operators.udf.r.{RUDFOpDesc, RUDFSourceOpDesc} import edu.uci.ics.texera.workflow.operators.union.UnionOpDesc import edu.uci.ics.texera.workflow.operators.unneststring.UnnestStringOpDesc @@ -134,11 +80,8 @@ import edu.uci.ics.texera.workflow.operators.visualization.scatter3DChart.Scatte import edu.uci.ics.texera.workflow.operators.visualization.ScatterMatrixChart.ScatterMatrixChartOpDesc import edu.uci.ics.texera.workflow.operators.visualization.funnelPlot.FunnelPlotOpDesc import edu.uci.ics.texera.workflow.operators.visualization.tablesChart.TablesPlotOpDesc - import edu.uci.ics.texera.workflow.operators.visualization.icicleChart.IcicleChartOpDesc - import edu.uci.ics.texera.workflow.operators.visualization.continuousErrorBands.ContinuousErrorBandsOpDesc - import edu.uci.ics.texera.workflow.operators.visualization.ternaryPlot.TernaryPlotOpDesc import org.apache.commons.lang3.builder.{EqualsBuilder, HashCodeBuilder, ToStringBuilder} import org.apache.zookeeper.KeeperException.UnimplementedException @@ -147,6 +90,7 @@ import edu.uci.ics.texera.workflow.operators.visualization.quiverPlot.QuiverPlot import edu.uci.ics.texera.workflow.operators.visualization.contourPlot.ContourPlotOpDesc import edu.uci.ics.texera.workflow.operators.visualization.figureFactoryTable.FigureFactoryTableOpDesc import edu.uci.ics.texera.workflow.operators.visualization.sankeyDiagram.SankeyDiagramOpDesc + import java.util.UUID import scala.collection.mutable import scala.util.Try diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/filter/FilterOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/filter/FilterOpExec.scala index bb461ec6b86..e48ad522b0a 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/filter/FilterOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/filter/FilterOpExec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.common.operators.filter +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor abstract class FilterOpExec extends OperatorExecutor with Serializable { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/flatmap/FlatMapOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/flatmap/FlatMapOpExec.scala index e218442e586..6a648cf67df 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/flatmap/FlatMapOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/flatmap/FlatMapOpExec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.common.operators.flatmap +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor /** * Executes a flatMap() operation. diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/map/MapOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/map/MapOpExec.scala index d845a839ec2..088d08211e7 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/map/MapOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/map/MapOpExec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.common.operators.map +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor /** * Common operator executor of a map() function diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/LogicalPlan.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/LogicalPlan.scala index 84c56903842..3ea3e24fd06 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/LogicalPlan.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/LogicalPlan.scala @@ -1,11 +1,11 @@ package edu.uci.ics.texera.workflow.common.workflow import com.typesafe.scalalogging.LazyLogging +import edu.uci.ics.amber.engine.common.model.WorkflowContext import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.OperatorIdentity import edu.uci.ics.amber.engine.common.workflow.PortIdentity import edu.uci.ics.texera.web.model.websocket.request.LogicalPlanPojo -import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.common.operators.LogicalOp import edu.uci.ics.texera.workflow.common.operators.source.SourceOperatorDescriptor import org.jgrapht.graph.DirectedAcyclicGraph diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/WorkflowCompiler.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/WorkflowCompiler.scala index 9e69586de73..4358f0dc14f 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/WorkflowCompiler.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/WorkflowCompiler.scala @@ -3,6 +3,7 @@ package edu.uci.ics.texera.workflow.common.workflow import com.google.protobuf.timestamp.Timestamp import com.typesafe.scalalogging.LazyLogging import edu.uci.ics.amber.engine.architecture.controller.Workflow +import edu.uci.ics.amber.engine.common.model.{PhysicalPlan, WorkflowContext} import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.OperatorIdentity import edu.uci.ics.amber.error.ErrorUtils.getStackTraceWithAllCauses @@ -14,7 +15,6 @@ import edu.uci.ics.texera.web.storage.ExecutionStateStore.updateWorkflowState import edu.uci.ics.texera.web.workflowruntimestate.FatalErrorType.COMPILATION_ERROR import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.FAILED import edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError -import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.common.storage.OpResultStorage import edu.uci.ics.texera.workflow.operators.sink.managed.ProgressiveSinkOpDesc import edu.uci.ics.texera.workflow.operators.visualization.VisualizationConstants diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregateOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregateOpDesc.scala index 813f9ae748e..2baef8207a5 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregateOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregateOpDesc.scala @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.PhysicalPlan import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ ExecutionIdentity, @@ -14,7 +15,7 @@ import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, Physical import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeNameList import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.LogicalOp -import edu.uci.ics.texera.workflow.common.workflow.{HashPartition, PhysicalPlan} +import edu.uci.ics.texera.workflow.common.workflow.HashPartition class AggregateOpDesc extends LogicalOp { @JsonProperty(value = "aggregations", required = true) diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregateOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregateOpExec.scala index 9daf461fc64..9352357f55e 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregateOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregateOpExec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.aggregate +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpExec.scala index f2cabe9047d..ec0a755ae8c 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpExec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.cartesianProduct +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor import edu.uci.ics.texera.workflow.operators.hashJoin.JoinUtils import scala.collection.mutable.ArrayBuffer diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpExec.scala index 84e9257d9c9..8a3b55d2023 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpExec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.difference +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpExec.scala index 2124a9c7b7f..ae87b30ef5f 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpExec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.distinct +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpExec.scala index d3f399ce574..75adedbcebd 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpExec.scala @@ -1,8 +1,8 @@ package edu.uci.ics.texera.workflow.operators.download +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor +import edu.uci.ics.amber.engine.common.model.WorkflowContext import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} -import edu.uci.ics.texera.workflow.common.WorkflowContext -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor import edu.uci.ics.texera.workflow.operators.source.fetcher.URLFetchUtil.getInputStreamFromURL import java.net.URL diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/filter/SpecializedFilterOpDesc.java b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/filter/SpecializedFilterOpDesc.java index 2b43aa23383..83f5595008e 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/filter/SpecializedFilterOpDesc.java +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/filter/SpecializedFilterOpDesc.java @@ -11,7 +11,7 @@ import edu.uci.ics.amber.engine.common.workflow.PortIdentity; import edu.uci.ics.texera.workflow.common.metadata.OperatorGroupConstants; import edu.uci.ics.texera.workflow.common.metadata.OperatorInfo; -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor; +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor; import edu.uci.ics.texera.workflow.common.operators.filter.FilterOpDesc; import scala.Tuple2; diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinBuildOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinBuildOpExec.scala index fcf2ab62c32..a17bf3c0489 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinBuildOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinBuildOpExec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.hashJoin +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor import scala.collection.mutable import scala.collection.mutable.ListBuffer diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinOpDesc.scala index 9e40461a7ba..d3c3b8d3412 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinOpDesc.scala @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.PhysicalPlan import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ ExecutionIdentity, @@ -18,7 +19,7 @@ import edu.uci.ics.texera.workflow.common.metadata.annotations.{ } import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.LogicalOp -import edu.uci.ics.texera.workflow.common.workflow.{HashPartition, OneToOnePartition, PhysicalPlan} +import edu.uci.ics.texera.workflow.common.workflow.{HashPartition, OneToOnePartition} object HashJoinOpDesc { val HASH_JOIN_INTERNAL_KEY_NAME = "__internal__hashtable__key__" diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinProbeOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinProbeOpExec.scala index 2acf6d55ed8..5dffd14850f 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinProbeOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinProbeOpExec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.hashJoin +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor import edu.uci.ics.texera.workflow.operators.hashJoin.HashJoinOpDesc.HASH_JOIN_INTERNAL_KEY_NAME import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpExec.scala index f11304da99b..11718af5fd7 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpExec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.intersect +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalJoinOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalJoinOpExec.scala index e30d70468bb..2a0d8254466 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalJoinOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalJoinOpExec.scala @@ -1,8 +1,8 @@ package edu.uci.ics.texera.workflow.operators.intervalJoin import edu.uci.ics.amber.engine.common.amberexception.WorkflowRuntimeException +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Tuple, TupleLike} -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor import edu.uci.ics.texera.workflow.operators.hashJoin.JoinUtils import java.sql.Timestamp diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/limit/LimitOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/limit/LimitOpExec.scala index ca05d2e9c7e..8e016f3aa1c 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/limit/LimitOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/limit/LimitOpExec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.limit +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor class LimitOpExec(limit: Int) extends OperatorExecutor { var count = 0 diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/reservoirsampling/ReservoirSamplingOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/reservoirsampling/ReservoirSamplingOpExec.scala index 9e41625596c..3eef54aa752 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/reservoirsampling/ReservoirSamplingOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/reservoirsampling/ReservoirSamplingOpExec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.reservoirsampling +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor import scala.util.Random diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpDesc.java b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpDesc.java index e31fa8c0167..6f0cbde553c 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpDesc.java +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpDesc.java @@ -11,11 +11,11 @@ import edu.uci.ics.amber.engine.common.workflow.InputPort; import edu.uci.ics.amber.engine.common.workflow.OutputPort; import edu.uci.ics.amber.engine.common.workflow.PortIdentity; -import edu.uci.ics.texera.workflow.common.IncrementalOutputMode; +import edu.uci.ics.amber.engine.common.IncrementalOutputMode; import edu.uci.ics.texera.workflow.common.ProgressiveUtils; import edu.uci.ics.texera.workflow.common.metadata.OperatorGroupConstants; import edu.uci.ics.texera.workflow.common.metadata.OperatorInfo; -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor; +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor; import edu.uci.ics.amber.engine.common.model.tuple.Schema; import edu.uci.ics.texera.workflow.operators.sink.SinkOpDesc; import edu.uci.ics.texera.workflow.operators.sink.storage.SinkStorageReader; @@ -30,7 +30,7 @@ import java.util.function.Function; -import static edu.uci.ics.texera.workflow.common.IncrementalOutputMode.SET_SNAPSHOT; +import static edu.uci.ics.amber.engine.common.IncrementalOutputMode.SET_SNAPSHOT; import static java.util.Collections.singletonList; import static scala.jdk.javaapi.CollectionConverters.asScala; diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpExec.scala index 724b35dc5b7..9a093bb634a 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpExec.scala @@ -1,9 +1,9 @@ package edu.uci.ics.texera.workflow.operators.sink.managed -import edu.uci.ics.amber.engine.common.SinkOperatorExecutor +import edu.uci.ics.amber.engine.common.{IncrementalOutputMode, ProgressiveUtils} +import edu.uci.ics.amber.engine.common.executor.SinkOperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} -import edu.uci.ics.texera.workflow.common.IncrementalOutputMode._ -import edu.uci.ics.texera.workflow.common.{IncrementalOutputMode, ProgressiveUtils} +import edu.uci.ics.amber.engine.common.IncrementalOutputMode._ import edu.uci.ics.texera.workflow.operators.sink.storage.SinkStorageWriter class ProgressiveSinkOpExec(outputMode: IncrementalOutputMode, storage: SinkStorageWriter) diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionOpExec.scala index ba412edffa5..4cf19bcee11 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionOpExec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.sortPartitions +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Tuple, TupleLike} -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor import scala.collection.mutable.ArrayBuffer diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/TwitterSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/TwitterSourceOpExec.scala index 8a33c34bbb9..18117b0f256 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/TwitterSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/TwitterSourceOpExec.scala @@ -1,5 +1,6 @@ package edu.uci.ics.texera.workflow.operators.source.apis.twitter -import edu.uci.ics.amber.engine.common.SourceOperatorExecutor + +import edu.uci.ics.amber.engine.common.executor.SourceOperatorExecutor import io.github.redouane59.twitter.TwitterClient import io.github.redouane59.twitter.signature.TwitterCredentials diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/cache/CacheSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/cache/CacheSourceOpExec.scala index b872fc1e254..ca613bb05cc 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/cache/CacheSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/cache/CacheSourceOpExec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.source.cache import com.typesafe.scalalogging.LazyLogging -import edu.uci.ics.amber.engine.common.SourceOperatorExecutor +import edu.uci.ics.amber.engine.common.executor.SourceOperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.TupleLike import edu.uci.ics.texera.workflow.operators.sink.storage.SinkStorageReader diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/fetcher/URLFetcherOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/fetcher/URLFetcherOpExec.scala index b0803f6fdee..bdd83681ea4 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/fetcher/URLFetcherOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/fetcher/URLFetcherOpExec.scala @@ -1,6 +1,6 @@ package edu.uci.ics.texera.workflow.operators.source.fetcher -import edu.uci.ics.amber.engine.common.SourceOperatorExecutor +import edu.uci.ics.amber.engine.common.executor.SourceOperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.TupleLike import edu.uci.ics.texera.workflow.operators.source.fetcher.URLFetchUtil.getInputStreamFromURL import org.apache.commons.io.IOUtils diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/FileScanSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/FileScanSourceOpExec.scala index 174e2047cb7..0244195d4a9 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/FileScanSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/FileScanSourceOpExec.scala @@ -1,6 +1,6 @@ package edu.uci.ics.texera.workflow.operators.source.scan -import edu.uci.ics.amber.engine.common.SourceOperatorExecutor +import edu.uci.ics.amber.engine.common.executor.SourceOperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.TupleLike import edu.uci.ics.amber.engine.common.storage.DatasetFileDocument import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.parseField diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/ScanSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/ScanSourceOpDesc.scala index c335cadbac2..dce34946a34 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/ScanSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/ScanSourceOpDesc.scala @@ -4,10 +4,10 @@ import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty, JsonPropertyD import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.engine.common.AmberConfig +import edu.uci.ics.amber.engine.common.model.WorkflowContext import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.storage.DatasetFileDocument import edu.uci.ics.amber.engine.common.workflow.OutputPort -import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} import edu.uci.ics.texera.workflow.common.operators.source.SourceOperatorDescriptor import org.apache.commons.lang3.builder.EqualsBuilder diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpExec.scala index 61e6638be0b..fe5a9a61051 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpExec.scala @@ -1,9 +1,9 @@ package edu.uci.ics.texera.workflow.operators.source.scan.csv import com.univocity.parsers.csv.{CsvFormat, CsvParser, CsvParserSettings} +import edu.uci.ics.amber.engine.common.executor.SourceOperatorExecutor import edu.uci.ics.amber.engine.common.workflow.PortIdentity import edu.uci.ics.amber.engine.common.{CheckpointState, CheckpointSupport} -import edu.uci.ics.amber.engine.common.SourceOperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{AttributeTypeUtils, Schema, TupleLike} import edu.uci.ics.amber.engine.common.storage.DatasetFileDocument import edu.uci.ics.texera.workflow.operators.source.scan.FileDecodingMethod diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/ParallelCSVScanSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/ParallelCSVScanSourceOpExec.scala index 105f9fc2c0e..3e5dd9dd2a9 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/ParallelCSVScanSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/ParallelCSVScanSourceOpExec.scala @@ -1,6 +1,6 @@ package edu.uci.ics.texera.workflow.operators.source.scan.csv -import edu.uci.ics.amber.engine.common.SourceOperatorExecutor +import edu.uci.ics.amber.engine.common.executor.SourceOperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeTypeUtils, Schema, TupleLike} import edu.uci.ics.texera.workflow.common.scanner.BufferedBlockReader import org.tukaani.xz.SeekableFileInputStream diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csvOld/CSVOldScanSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csvOld/CSVOldScanSourceOpExec.scala index 41165bea74f..defc6bb7c3a 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csvOld/CSVOldScanSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csvOld/CSVOldScanSourceOpExec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.source.scan.csvOld import com.github.tototoshi.csv.{CSVReader, DefaultCSVFormat} -import edu.uci.ics.amber.engine.common.SourceOperatorExecutor +import edu.uci.ics.amber.engine.common.executor.SourceOperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeTypeUtils, Schema, TupleLike} import edu.uci.ics.texera.workflow.operators.source.scan.FileDecodingMethod diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/json/JSONLScanSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/json/JSONLScanSourceOpExec.scala index 5aaf7b29aa9..abb9c09a48b 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/json/JSONLScanSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/json/JSONLScanSourceOpExec.scala @@ -1,6 +1,6 @@ package edu.uci.ics.texera.workflow.operators.source.scan.json -import edu.uci.ics.amber.engine.common.SourceOperatorExecutor +import edu.uci.ics.amber.engine.common.executor.SourceOperatorExecutor import edu.uci.ics.amber.engine.common.storage.DatasetFileDocument import edu.uci.ics.texera.Utils.objectMapper import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.parseField diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/TextInputSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/TextInputSourceOpExec.scala index 0c33c604db5..0a7ca8fc815 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/TextInputSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/TextInputSourceOpExec.scala @@ -1,6 +1,6 @@ package edu.uci.ics.texera.workflow.operators.source.scan.text -import edu.uci.ics.amber.engine.common.SourceOperatorExecutor +import edu.uci.ics.amber.engine.common.executor.SourceOperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.TupleLike import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.parseField import edu.uci.ics.texera.workflow.operators.source.scan.FileAttributeType diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/SQLSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/SQLSourceOpExec.scala index 3e5e11907e2..d437c95f407 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/SQLSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/SQLSourceOpExec.scala @@ -1,6 +1,6 @@ package edu.uci.ics.texera.workflow.operators.source.sql -import edu.uci.ics.amber.engine.common.SourceOperatorExecutor +import edu.uci.ics.amber.engine.common.executor.SourceOperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.{ parseField, parseTimestamp diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/split/SplitOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/split/SplitOpExec.scala index c0f6d9c5108..2fefd46f846 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/split/SplitOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/split/SplitOpExec.scala @@ -1,8 +1,8 @@ package edu.uci.ics.texera.workflow.operators.split +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.amber.engine.common.workflow.PortIdentity -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor import scala.util.Random diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpExec.scala index 101325afa62..77955f4a9fb 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpExec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.symmetricDifference +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpDesc.java b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpDesc.java index 8071c76fe33..dc8e07afb7e 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpDesc.java +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpDesc.java @@ -14,7 +14,7 @@ import edu.uci.ics.amber.engine.common.workflow.PortIdentity; import edu.uci.ics.texera.workflow.common.metadata.OperatorGroupConstants; import edu.uci.ics.texera.workflow.common.metadata.OperatorInfo; -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor; +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor; import edu.uci.ics.texera.workflow.common.operators.map.MapOpDesc; diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/union/UnionOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/union/UnionOpExec.scala index c36870c4095..2f2bd3bc0a6 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/union/UnionOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/union/UnionOpExec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.union +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor class UnionOpExec extends OperatorExecutor { override def processTuple(tuple: Tuple, port: Int): Iterator[TupleLike] = { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/VisualizationOperator.java b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/VisualizationOperator.java index 9138004eaec..fb8abcc618a 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/VisualizationOperator.java +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/VisualizationOperator.java @@ -1,6 +1,6 @@ package edu.uci.ics.texera.workflow.operators.visualization; -import edu.uci.ics.texera.workflow.common.IncrementalOutputMode; +import edu.uci.ics.amber.engine.common.IncrementalOutputMode; import edu.uci.ics.texera.workflow.common.operators.LogicalOp; /** diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpExec.scala index 6f7a0f36900..e78bd6df271 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpExec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.visualization.htmlviz +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor /** * HTML Visualization operator to render any given HTML code diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/urlviz/UrlVizOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/urlviz/UrlVizOpExec.scala index 1a197346182..44fc84c67e1 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/urlviz/UrlVizOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/urlviz/UrlVizOpExec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.visualization.urlviz +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor /** * URL Visualization operator to render any given URL link 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 21516955303..c404f4601e2 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 @@ -3,6 +3,7 @@ package edu.uci.ics.amber.engine.architecture.messaginglayer import com.softwaremill.macwire.wire import edu.uci.ics.amber.engine.architecture.sendsemantics.partitionings.OneToOnePartitioning import edu.uci.ics.amber.engine.common.ambermessage._ +import edu.uci.ics.amber.engine.common.model.EndOfInputChannel import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema, TupleLike} import edu.uci.ics.amber.engine.common.virtualidentity.{ ActorVirtualIdentity, @@ -11,7 +12,6 @@ import edu.uci.ics.amber.engine.common.virtualidentity.{ PhysicalOpIdentity } import edu.uci.ics.amber.engine.common.workflow.{PhysicalLink, PortIdentity} -import edu.uci.ics.texera.workflow.common.EndOfInputChannel 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 b89fe31c94a..9d1e737b9a0 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 @@ -10,12 +10,12 @@ import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.{ import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.PauseHandler.PauseWorker import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.ResumeHandler.ResumeWorker import edu.uci.ics.amber.engine.common.ambermessage.{DataFrame, WorkflowFIFOMessage} +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema, Tuple, TupleLike} 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.{ActorVirtualIdentity, ChannelIdentity} import edu.uci.ics.amber.engine.common.workflow.PortIdentity -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor 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 d43b6712288..38c2011a41d 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 @@ -7,6 +7,8 @@ import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.OpenExecutor import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerState.READY import edu.uci.ics.amber.engine.common.VirtualIdentityUtils import edu.uci.ics.amber.engine.common.ambermessage.{DataFrame, MarkerFrame, WorkflowFIFOMessage} +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor +import edu.uci.ics.amber.engine.common.model.EndOfInputChannel import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema, Tuple, TupleLike} import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation @@ -19,9 +21,7 @@ import edu.uci.ics.amber.engine.common.virtualidentity.{ PhysicalOpIdentity } import edu.uci.ics.amber.engine.common.workflow.PortIdentity -import edu.uci.ics.texera.workflow.common.EndOfInputChannel -import edu.uci.ics.texera.workflow.common.WorkflowContext.DEFAULT_WORKFLOW_ID -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor +import edu.uci.ics.amber.engine.common.model.WorkflowContext.DEFAULT_WORKFLOW_ID 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 0c31d4d3030..2bfdfc7ff33 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 @@ -17,6 +17,7 @@ import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.AddPartition import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.AssignPortHandler.AssignPort import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.InitializeExecutorHandler.InitializeExecutor import edu.uci.ics.amber.engine.common.ambermessage.{DataFrame, DataPayload, WorkflowFIFOMessage} +import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, Tuple, TupleLike} import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation @@ -28,7 +29,6 @@ import edu.uci.ics.amber.engine.common.virtualidentity.{ PhysicalOpIdentity } import edu.uci.ics.amber.engine.common.workflow.{PhysicalLink, PortIdentity} -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor 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/TestUtils.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/TestUtils.scala index 694d051749c..53d60af4887 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/TestUtils.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/e2e/TestUtils.scala @@ -1,9 +1,9 @@ package edu.uci.ics.amber.engine.e2e import edu.uci.ics.amber.engine.architecture.controller.Workflow +import edu.uci.ics.amber.engine.common.model.WorkflowContext import edu.uci.ics.texera.web.model.websocket.request.LogicalPlanPojo import edu.uci.ics.texera.web.storage.ExecutionStateStore -import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.common.operators.LogicalOp import edu.uci.ics.texera.workflow.common.storage.OpResultStorage import edu.uci.ics.texera.workflow.common.workflow.{LogicalLink, WorkflowCompiler} 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 9836f128b69..9e338a80a49 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 @@ -19,11 +19,12 @@ import edu.uci.ics.amber.engine.architecture.worker.DataProcessor import edu.uci.ics.amber.engine.common.{ AmberRuntime, CheckpointState, - CheckpointSupport, - SourceOperatorExecutor + CheckpointSupport } import edu.uci.ics.amber.engine.common.SerializedState.{CP_STATE_KEY, DP_STATE_KEY} import edu.uci.ics.amber.engine.common.client.AmberClient +import edu.uci.ics.amber.engine.common.executor.{OperatorExecutor, SourceOperatorExecutor} +import edu.uci.ics.amber.engine.common.model.WorkflowContext import edu.uci.ics.amber.engine.common.virtualidentity.{ ChannelMarkerIdentity, ExecutionIdentity, @@ -34,8 +35,6 @@ import edu.uci.ics.amber.engine.common.workflow.PortIdentity import edu.uci.ics.amber.engine.e2e.TestOperators import edu.uci.ics.amber.engine.e2e.TestUtils.buildWorkflow import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.{COMPLETED, PAUSED} -import edu.uci.ics.texera.workflow.common.WorkflowContext -import edu.uci.ics.texera.workflow.common.operators.OperatorExecutor import edu.uci.ics.texera.workflow.common.storage.OpResultStorage import edu.uci.ics.texera.workflow.common.workflow.LogicalLink import org.scalatest.BeforeAndAfterAll diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/workflow/SchemaPropagationSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/workflow/SchemaPropagationSpec.scala index c034096ba3f..d739c908ea2 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/workflow/SchemaPropagationSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/workflow/SchemaPropagationSpec.scala @@ -1,6 +1,7 @@ package edu.uci.ics.texera.workflow.common.workflow import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp +import edu.uci.ics.amber.engine.common.model.WorkflowContext import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ ExecutionIdentity, @@ -8,7 +9,6 @@ import edu.uci.ics.amber.engine.common.virtualidentity.{ WorkflowIdentity } import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, PortIdentity} -import edu.uci.ics.texera.workflow.common.WorkflowContext import edu.uci.ics.texera.workflow.common.metadata.OperatorInfo import edu.uci.ics.texera.workflow.common.operators.LogicalOp import edu.uci.ics.texera.workflow.common.operators.source.SourceOperatorDescriptor diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpExecSpec.scala index 8e1fe816fe9..3e96b3f4332 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpExecSpec.scala @@ -1,8 +1,8 @@ package edu.uci.ics.texera.workflow.operators.download +import edu.uci.ics.amber.engine.common.model.WorkflowContext import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, Tuple} -import edu.uci.ics.texera.workflow.common.WorkflowContext -import edu.uci.ics.texera.workflow.common.WorkflowContext.{ +import WorkflowContext.{ DEFAULT_EXECUTION_ID, DEFAULT_WORKFLOW_ID } diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpDescSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpDescSpec.scala index 5af8b0dca09..1b598279d40 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpDescSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpDescSpec.scala @@ -1,9 +1,9 @@ package edu.uci.ics.texera.workflow.operators.source.scan.csv +import edu.uci.ics.amber.engine.common.model.WorkflowContext import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.PortIdentity -import edu.uci.ics.texera.workflow.common.WorkflowContext -import edu.uci.ics.texera.workflow.common.WorkflowContext.{ +import WorkflowContext.{ DEFAULT_EXECUTION_ID, DEFAULT_WORKFLOW_ID } From 426472e58abc74ebcbf6983b4163f889b6940e82 Mon Sep 17 00:00:00 2001 From: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com> Date: Tue, 8 Oct 2024 16:47:57 -0700 Subject: [PATCH 3/7] move protobufs --- .../engine/common}/workflowruntimestate.proto | 2 +- .../amber/clustering/ClusterListener.scala | 6 +- .../controller/ControllerEvent.scala | 2 +- .../controller/execution/ExecutionUtils.scala | 2 +- .../execution/OperatorExecution.scala | 2 +- .../execution/RegionExecution.scala | 2 +- .../execution/WorkflowExecution.scala | 4 +- .../StartWorkflowHandler.scala | 4 +- .../RegionExecutionCoordinator.scala | 2 +- .../common/executor/OperatorExecutor.scala | 1 + .../engine/common/model/WorkflowContext.scala | 1 + .../main/scala/edu/uci/ics/texera/Utils.scala | 2 +- .../edu/uci/ics/texera/web/JsonTest.scala | 22 --- .../ics/texera/web/TexeraWebApplication.scala | 2 +- .../texera/web/WorkflowLifecycleManager.scala | 4 +- .../websocket/event/WorkflowErrorEvent.scala | 2 +- .../resource/WorkflowWebsocketResource.scala | 6 +- .../web/service/ExecutionConsoleService.scala | 4 +- .../web/service/ExecutionResultService.scala | 4 +- .../web/service/ExecutionRuntimeService.scala | 2 +- .../web/service/ExecutionStatsService.scala | 6 +- .../service/WorkflowExecutionService.scala | 4 +- .../texera/web/service/WorkflowService.scala | 6 +- .../web/storage/ExecutionStateStore.scala | 8 +- .../common/workflow/WorkflowCompiler.scala | 6 +- .../operators/filter/FilterPredicate.java | 2 +- .../sink/managed/ProgressiveSinkOpDesc.java | 2 +- .../source/sql/SQLSourceOpExec.scala | 43 +++--- .../sql/asterixdb/AsterixDBSourceOpExec.scala | 8 +- .../typecasting/TypeCastingOpDesc.java | 2 +- .../BreakpointFault.scala | 76 +++++----- .../EvaluatedValueList.scala | 26 ++-- .../ExecutionBreakpointStore.scala | 110 +++++++-------- .../ExecutionConsoleStore.scala | 110 +++++++-------- .../ExecutionMetadataStore.scala | 64 ++++----- .../ExecutionStatsStore.scala | 130 +++++++++--------- .../workflowruntimestate/FatalErrorType.scala | 6 +- .../OperatorBreakpoints.scala | 46 +++---- .../OperatorConsole.scala | 110 +++++++-------- .../OperatorMetrics.scala | 70 +++++----- .../OperatorStatistics.scala | 26 ++-- .../OperatorWorkerMapping.scala | 26 ++-- .../WorkflowAggregatedState.scala | 6 +- .../WorkflowFatalError.scala | 44 +++--- .../WorkflowruntimestateProto.scala | 112 +++++++++++++++ .../WorkflowruntimestateProto.scala | 110 --------------- 46 files changed, 604 insertions(+), 631 deletions(-) rename core/amber/src/main/protobuf/edu/uci/ics/{texera => amber/engine/common}/workflowruntimestate.proto (98%) delete mode 100644 core/amber/src/main/scala/edu/uci/ics/texera/web/JsonTest.scala rename core/amber/src/main/scalapb/edu/uci/ics/{texera/web => amber/engine/common}/workflowruntimestate/BreakpointFault.scala (72%) rename core/amber/src/main/scalapb/edu/uci/ics/{texera/web => amber/engine/common}/workflowruntimestate/EvaluatedValueList.scala (80%) rename core/amber/src/main/scalapb/edu/uci/ics/{texera/web => amber/engine/common}/workflowruntimestate/ExecutionBreakpointStore.scala (53%) rename core/amber/src/main/scalapb/edu/uci/ics/{texera/web => amber/engine/common}/workflowruntimestate/ExecutionConsoleStore.scala (54%) rename core/amber/src/main/scalapb/edu/uci/ics/{texera/web => amber/engine/common}/workflowruntimestate/ExecutionMetadataStore.scala (66%) rename core/amber/src/main/scalapb/edu/uci/ics/{texera/web => amber/engine/common}/workflowruntimestate/ExecutionStatsStore.scala (58%) rename core/amber/src/main/scalapb/edu/uci/ics/{texera/web => amber/engine/common}/workflowruntimestate/FatalErrorType.scala (81%) rename core/amber/src/main/scalapb/edu/uci/ics/{texera/web => amber/engine/common}/workflowruntimestate/OperatorBreakpoints.scala (61%) rename core/amber/src/main/scalapb/edu/uci/ics/{texera/web => amber/engine/common}/workflowruntimestate/OperatorConsole.scala (60%) rename core/amber/src/main/scalapb/edu/uci/ics/{texera/web => amber/engine/common}/workflowruntimestate/OperatorMetrics.scala (50%) rename core/amber/src/main/scalapb/edu/uci/ics/{texera/web => amber/engine/common}/workflowruntimestate/OperatorStatistics.scala (90%) rename core/amber/src/main/scalapb/edu/uci/ics/{texera/web => amber/engine/common}/workflowruntimestate/OperatorWorkerMapping.scala (81%) rename core/amber/src/main/scalapb/edu/uci/ics/{texera/web => amber/engine/common}/workflowruntimestate/WorkflowAggregatedState.scala (90%) rename core/amber/src/main/scalapb/edu/uci/ics/{texera/web => amber/engine/common}/workflowruntimestate/WorkflowFatalError.scala (79%) create mode 100644 core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/WorkflowruntimestateProto.scala delete mode 100644 core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/WorkflowruntimestateProto.scala diff --git a/core/amber/src/main/protobuf/edu/uci/ics/texera/workflowruntimestate.proto b/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/common/workflowruntimestate.proto similarity index 98% rename from core/amber/src/main/protobuf/edu/uci/ics/texera/workflowruntimestate.proto rename to core/amber/src/main/protobuf/edu/uci/ics/amber/engine/common/workflowruntimestate.proto index 8040938eba9..9dfb2a0d2e5 100644 --- a/core/amber/src/main/protobuf/edu/uci/ics/texera/workflowruntimestate.proto +++ b/core/amber/src/main/protobuf/edu/uci/ics/amber/engine/common/workflowruntimestate.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package edu.uci.ics.texera.web; +package edu.uci.ics.amber.engine.common; import "edu/uci/ics/amber/engine/architecture/worker/controlcommands.proto"; import "edu/uci/ics/amber/engine/architecture/worker/controlreturns.proto"; 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 24dd1d994d8..d86ff9176dd 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,10 +12,10 @@ import edu.uci.ics.amber.error.ErrorUtils.getStackTraceWithAllCauses 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} -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.{COMPLETED, FAILED} +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.{COMPLETED, FAILED} import edu.uci.ics.texera.web.storage.ExecutionStateStore.updateWorkflowState -import edu.uci.ics.texera.web.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError +import edu.uci.ics.amber.engine.common.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError import java.time.Instant import scala.collection.mutable.ArrayBuffer diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerEvent.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerEvent.scala index 2af21e59fa9..8cf36af3e49 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerEvent.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerEvent.scala @@ -3,7 +3,7 @@ package edu.uci.ics.amber.engine.architecture.controller import edu.uci.ics.amber.engine.common.model.tuple.Tuple import edu.uci.ics.amber.engine.common.rpc.AsyncRPCServer.ControlCommand import edu.uci.ics.amber.engine.common.virtualidentity.ActorVirtualIdentity -import edu.uci.ics.texera.web.workflowruntimestate.{OperatorMetrics, WorkflowAggregatedState} +import edu.uci.ics.amber.engine.common.workflowruntimestate.{OperatorMetrics, WorkflowAggregatedState} object ControllerEvent { diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/ExecutionUtils.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/ExecutionUtils.scala index 732f0ed9c52..0fbd732eff3 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/ExecutionUtils.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/execution/ExecutionUtils.scala @@ -1,7 +1,7 @@ package edu.uci.ics.amber.engine.architecture.controller.execution import edu.uci.ics.amber.engine.architecture.worker.statistics.PortTupleCountMapping -import edu.uci.ics.texera.web.workflowruntimestate.{ +import edu.uci.ics.amber.engine.common.workflowruntimestate.{ OperatorMetrics, OperatorStatistics, WorkflowAggregatedState 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 ec7bafc10c4..1eeb7f1e488 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,7 +5,7 @@ import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.WorkerExecuti import edu.uci.ics.amber.engine.architecture.worker.statistics.{PortTupleCountMapping, WorkerState} import edu.uci.ics.amber.engine.common.virtualidentity.ActorVirtualIdentity import edu.uci.ics.amber.engine.common.workflow.PortIdentity -import edu.uci.ics.texera.web.workflowruntimestate.{ +import edu.uci.ics.amber.engine.common.workflowruntimestate.{ OperatorMetrics, OperatorStatistics, WorkflowAggregatedState 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 8d13b7c926f..34e781e4e67 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,7 +5,7 @@ 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.virtualidentity.PhysicalOpIdentity import edu.uci.ics.amber.engine.common.workflow.PhysicalLink -import edu.uci.ics.texera.web.workflowruntimestate.{OperatorMetrics, WorkflowAggregatedState} +import edu.uci.ics.amber.engine.common.workflowruntimestate.{OperatorMetrics, WorkflowAggregatedState} 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 f1c066da7de..365dfc6e580 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 @@ -3,8 +3,8 @@ package edu.uci.ics.amber.engine.architecture.controller.execution import edu.uci.ics.amber.engine.architecture.controller.execution.ExecutionUtils.aggregateMetrics import edu.uci.ics.amber.engine.architecture.scheduling.{Region, RegionIdentity} import edu.uci.ics.amber.engine.common.virtualidentity.PhysicalOpIdentity -import edu.uci.ics.texera.web.workflowruntimestate.{OperatorMetrics, WorkflowAggregatedState} -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState._ +import edu.uci.ics.amber.engine.common.workflowruntimestate.{OperatorMetrics, WorkflowAggregatedState} +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState._ import scala.collection.mutable diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/StartWorkflowHandler.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/StartWorkflowHandler.scala index fbeef8bcf91..982ae8def43 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/StartWorkflowHandler.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/StartWorkflowHandler.scala @@ -4,8 +4,8 @@ import com.twitter.util.Future import edu.uci.ics.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer import edu.uci.ics.amber.engine.architecture.controller.promisehandlers.StartWorkflowHandler.StartWorkflow import edu.uci.ics.amber.engine.common.rpc.AsyncRPCServer.ControlCommand -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.RUNNING +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.RUNNING object StartWorkflowHandler { final case class StartWorkflow() extends ControlCommand[WorkflowAggregatedState] 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 231eff2ee1d..1a18116fe05 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 @@ -21,7 +21,7 @@ import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.StartHandler import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER import edu.uci.ics.amber.engine.common.workflow.PhysicalLink -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState import scala.collection.Seq class RegionExecutionCoordinator( diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/executor/OperatorExecutor.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/executor/OperatorExecutor.scala index 928bfdef618..dfa512a0dfe 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/executor/OperatorExecutor.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/executor/OperatorExecutor.scala @@ -1,5 +1,6 @@ package edu.uci.ics.amber.engine.common.executor +import edu.uci.ics.amber.engine.common.model.State import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} import edu.uci.ics.amber.engine.common.workflow.PortIdentity diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/WorkflowContext.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/WorkflowContext.scala index 28f697b5fd4..9f29215c277 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/WorkflowContext.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/WorkflowContext.scala @@ -1,6 +1,7 @@ package edu.uci.ics.amber.engine.common.model import edu.uci.ics.amber.engine.common.AmberConfig +import edu.uci.ics.amber.engine.common.model.WorkflowContext.{DEFAULT_EXECUTION_ID, DEFAULT_WORKFLOW_ID, DEFAULT_WORKFLOW_SETTINGS} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.workflow.WorkflowSettings diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/Utils.scala b/core/amber/src/main/scala/edu/uci/ics/texera/Utils.scala index 4da4b036bd2..57676ac4f6b 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/Utils.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/Utils.scala @@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.noctordeser.NoCtorDeserModule import com.fasterxml.jackson.module.scala.DefaultScalaModule import com.typesafe.scalalogging.LazyLogging -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState import org.jooq.DSLContext import org.jooq.impl.DSL diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/JsonTest.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/JsonTest.scala deleted file mode 100644 index 64cd4247cc7..00000000000 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/JsonTest.scala +++ /dev/null @@ -1,22 +0,0 @@ -package edu.uci.ics.texera.web - -import edu.uci.ics.texera.Utils -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.RUNNING - -object JsonTest { - - def main(args: Array[String]): Unit = { - val a = RUNNING - val om = Utils.objectMapper - - val str = om.writeValueAsString(a) - println(str) - - val des = om.readValue(str, classOf[WorkflowAggregatedState]) - println(des) - - } -} - -class JsonTest {} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWebApplication.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWebApplication.scala index a0319dea0b7..46438ef6703 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWebApplication.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWebApplication.scala @@ -54,7 +54,7 @@ import edu.uci.ics.texera.web.resource.dashboard.user.workflow.{ import edu.uci.ics.texera.web.resource.languageserver.PythonLanguageServerManager import edu.uci.ics.texera.web.service.ExecutionsMetadataPersistService import edu.uci.ics.texera.web.storage.MongoDatabaseManager -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.{COMPLETED, FAILED} +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.{COMPLETED, FAILED} import edu.uci.ics.texera.workflow.common.storage.OpResultStorage import io.dropwizard.auth.{AuthDynamicFeature, AuthValueFactoryProvider} import io.dropwizard.setup.{Bootstrap, Environment} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/WorkflowLifecycleManager.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/WorkflowLifecycleManager.scala index 185e20fa6a9..265f7f5f78d 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/WorkflowLifecycleManager.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/WorkflowLifecycleManager.scala @@ -5,8 +5,8 @@ import akka.actor.Cancellable import com.typesafe.scalalogging.LazyLogging import edu.uci.ics.amber.engine.common.AmberRuntime import edu.uci.ics.texera.web.storage.ExecutionStateStore -import edu.uci.ics.texera.web.workflowruntimestate.{ExecutionMetadataStore, WorkflowAggregatedState} -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.RUNNING +import edu.uci.ics.amber.engine.common.workflowruntimestate.{ExecutionMetadataStore, WorkflowAggregatedState} +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.RUNNING import scala.concurrent.duration.DurationInt 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 b909ffe835c..5afcb94f637 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.texera.web.workflowruntimestate.WorkflowFatalError +import edu.uci.ics.amber.engine.common.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 7fdcd83ba0d..eb41bee4cb0 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 @@ -17,9 +17,9 @@ import edu.uci.ics.texera.web.model.websocket.request._ import edu.uci.ics.texera.web.model.websocket.response._ import edu.uci.ics.texera.web.service.{WorkflowCacheChecker, WorkflowService} import edu.uci.ics.texera.web.storage.ExecutionStateStore -import edu.uci.ics.texera.web.workflowruntimestate.FatalErrorType.COMPILATION_ERROR -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.{PAUSED, RUNNING} -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError +import edu.uci.ics.amber.engine.common.workflowruntimestate.FatalErrorType.COMPILATION_ERROR +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.{PAUSED, RUNNING} +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError import edu.uci.ics.texera.web.{ServletAwareConfigurator, SessionState} import edu.uci.ics.texera.workflow.common.workflow.WorkflowCompiler 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 2515f2b4915..8d11b7be950 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 @@ -21,8 +21,8 @@ import edu.uci.ics.texera.web.model.websocket.request.python.{ import edu.uci.ics.texera.web.model.websocket.response.python.PythonExpressionEvaluateResponse import edu.uci.ics.texera.web.storage.ExecutionStateStore import edu.uci.ics.texera.web.storage.ExecutionStateStore.updateWorkflowState -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.{RESUMING, RUNNING} -import edu.uci.ics.texera.web.workflowruntimestate.{ +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.{RESUMING, RUNNING} +import edu.uci.ics.amber.engine.common.workflowruntimestate.{ EvaluatedValueList, ExecutionConsoleStore, OperatorConsole 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 b021727f2f5..b5a6f597ea6 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 @@ -26,8 +26,8 @@ import edu.uci.ics.texera.web.storage.{ WorkflowResultStore, WorkflowStateStore } -import edu.uci.ics.texera.web.workflowruntimestate.ExecutionMetadataStore -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.{ +import edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionMetadataStore +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.{ COMPLETED, FAILED, KILLED, 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 99995cfe2a6..ec1128d83c8 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 @@ -18,7 +18,7 @@ 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 -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState._ +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState._ import java.util.UUID 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 2739f4e0bd1..a4f86058212 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 @@ -26,15 +26,15 @@ import edu.uci.ics.texera.web.model.websocket.event.{ } import edu.uci.ics.texera.web.storage.ExecutionStateStore import edu.uci.ics.texera.web.storage.ExecutionStateStore.updateWorkflowState -import edu.uci.ics.texera.web.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE -import edu.uci.ics.texera.web.workflowruntimestate.{ +import edu.uci.ics.amber.engine.common.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE +import edu.uci.ics.amber.engine.common.workflowruntimestate.{ OperatorMetrics, OperatorStatistics, OperatorWorkerMapping, WorkflowAggregatedState, WorkflowFatalError } -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.FAILED +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.FAILED import java.time.Instant import org.jooq.types.{UInteger, ULong} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowExecutionService.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowExecutionService.scala index 56b15f956d2..f00429d0a95 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowExecutionService.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowExecutionService.scala @@ -14,8 +14,8 @@ import edu.uci.ics.texera.web.model.websocket.event.{ import edu.uci.ics.texera.web.model.websocket.request.WorkflowExecuteRequest import edu.uci.ics.texera.web.storage.ExecutionStateStore import edu.uci.ics.texera.web.storage.ExecutionStateStore.updateWorkflowState -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.{ +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.{ COMPLETED, FAILED, READY 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 be297674628..1fe344aaed1 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 @@ -21,9 +21,9 @@ import edu.uci.ics.texera.web.model.websocket.request.WorkflowExecuteRequest import edu.uci.ics.texera.web.service.WorkflowService.mkWorkflowStateId import edu.uci.ics.texera.web.storage.ExecutionStateStore.updateWorkflowState import edu.uci.ics.texera.web.storage.{ExecutionStateStore, WorkflowStateStore} -import edu.uci.ics.texera.web.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.{COMPLETED, FAILED} -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError +import edu.uci.ics.amber.engine.common.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.{COMPLETED, FAILED} +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError import edu.uci.ics.texera.web.{SubscriptionManager, WorkflowLifecycleManager} import edu.uci.ics.texera.workflow.common.storage.OpResultStorage import edu.uci.ics.texera.workflow.common.workflow.LogicalPlan diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/ExecutionStateStore.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/ExecutionStateStore.scala index 6b940c1d5bf..41a3e1114b8 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/ExecutionStateStore.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/ExecutionStateStore.scala @@ -2,13 +2,7 @@ package edu.uci.ics.texera.web.storage import edu.uci.ics.texera.Utils.maptoStatusCode import edu.uci.ics.texera.web.service.ExecutionsMetadataPersistService -import edu.uci.ics.texera.web.workflowruntimestate.{ - ExecutionBreakpointStore, - ExecutionConsoleStore, - ExecutionMetadataStore, - ExecutionStatsStore, - WorkflowAggregatedState -} +import edu.uci.ics.amber.engine.common.workflowruntimestate.{ExecutionBreakpointStore, ExecutionConsoleStore, ExecutionMetadataStore, ExecutionStatsStore, WorkflowAggregatedState} import java.sql.Timestamp diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/WorkflowCompiler.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/WorkflowCompiler.scala index 4358f0dc14f..7cb26a72181 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/WorkflowCompiler.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/WorkflowCompiler.scala @@ -12,9 +12,9 @@ import edu.uci.ics.texera.web.model.websocket.request.LogicalPlanPojo import edu.uci.ics.texera.web.service.ExecutionsMetadataPersistService import edu.uci.ics.texera.web.storage.ExecutionStateStore import edu.uci.ics.texera.web.storage.ExecutionStateStore.updateWorkflowState -import edu.uci.ics.texera.web.workflowruntimestate.FatalErrorType.COMPILATION_ERROR -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.FAILED -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError +import edu.uci.ics.amber.engine.common.workflowruntimestate.FatalErrorType.COMPILATION_ERROR +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.FAILED +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError import edu.uci.ics.texera.workflow.common.storage.OpResultStorage import edu.uci.ics.texera.workflow.operators.sink.managed.ProgressiveSinkOpDesc import edu.uci.ics.texera.workflow.operators.visualization.VisualizationConstants diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/filter/FilterPredicate.java b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/filter/FilterPredicate.java index 48dad74ea24..08c0ed143b8 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/filter/FilterPredicate.java +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/filter/FilterPredicate.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject; import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaString; -import edu.uci.ics.amber.engine.common.tuple.AttributeTypeUtils; +import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils; import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName; import edu.uci.ics.texera.workflow.common.metadata.annotations.HideAnnotation; import edu.uci.ics.amber.engine.common.model.tuple.Tuple; diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpDesc.java b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpDesc.java index 6f0cbde553c..e333855526d 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpDesc.java +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpDesc.java @@ -12,7 +12,7 @@ import edu.uci.ics.amber.engine.common.workflow.OutputPort; import edu.uci.ics.amber.engine.common.workflow.PortIdentity; import edu.uci.ics.amber.engine.common.IncrementalOutputMode; -import edu.uci.ics.texera.workflow.common.ProgressiveUtils; +import edu.uci.ics.amber.engine.common.ProgressiveUtils; import edu.uci.ics.texera.workflow.common.metadata.OperatorGroupConstants; import edu.uci.ics.texera.workflow.common.metadata.OperatorInfo; import edu.uci.ics.amber.engine.common.executor.OperatorExecutor; diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/SQLSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/SQLSourceOpExec.scala index d437c95f407..bb72386aacb 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/SQLSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/SQLSourceOpExec.scala @@ -1,11 +1,8 @@ package edu.uci.ics.texera.workflow.operators.source.sql import edu.uci.ics.amber.engine.common.executor.SourceOperatorExecutor -import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.{ - parseField, - parseTimestamp -} -import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, Schema, Tuple, TupleLike} +import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.{parseField, parseTimestamp} +import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, Tuple, TupleLike} import java.sql._ import scala.collection.mutable.ArrayBuffer @@ -217,11 +214,11 @@ abstract class SQLSourceOpExec( batchByAttribute match { case Some(attribute) => attribute.getType match { - case INTEGER | LONG | TIMESTAMP => + case AttributeType.INTEGER | AttributeType.LONG | AttributeType.TIMESTAMP => curLowerBound.longValue <= upperBound.longValue - case DOUBLE => + case AttributeType.DOUBLE => curLowerBound.doubleValue <= upperBound.doubleValue - case STRING | ANY | BOOLEAN | _ => + case AttributeType.STRING | AttributeType.ANY | AttributeType.BOOLEAN | _ => throw new IllegalArgumentException("Unexpected type: " + attribute.getType) } case None => @@ -271,13 +268,13 @@ abstract class SQLSourceOpExec( batchByAttribute match { case Some(attribute) => attribute.getType match { - case INTEGER | LONG | TIMESTAMP => + case AttributeType.INTEGER | AttributeType.LONG | AttributeType.TIMESTAMP => nextLowerBound = curLowerBound.longValue + interval isLastBatch = nextLowerBound.longValue >= upperBound.longValue - case DOUBLE => + case AttributeType.DOUBLE => nextLowerBound = curLowerBound.doubleValue + interval isLastBatch = nextLowerBound.doubleValue >= upperBound.doubleValue - case BOOLEAN | STRING | ANY | _ => + case AttributeType.BOOLEAN | AttributeType.STRING | AttributeType.ANY | _ => throw new IllegalArgumentException("Unexpected type: " + attribute.getType) } queryBuilder ++= " AND " + attribute.getName + @@ -307,11 +304,11 @@ abstract class SQLSourceOpExec( batchByAttribute match { case Some(attribute) => attribute.getType match { - case LONG | INTEGER | DOUBLE => + case AttributeType.LONG | AttributeType.INTEGER | AttributeType.DOUBLE => String.valueOf(value) - case TIMESTAMP => + case AttributeType.TIMESTAMP => "'" + new Timestamp(value.longValue).toString + "'" - case BOOLEAN | STRING | ANY | _ => + case AttributeType.BOOLEAN | AttributeType.STRING | AttributeType.ANY | _ => throw new IllegalArgumentException("Unexpected type: " + attribute.getType) } case None => @@ -339,15 +336,15 @@ abstract class SQLSourceOpExec( val resultSet = preparedStatement.executeQuery resultSet.next schema.getAttribute(attribute.getName).getType match { - case INTEGER => + case AttributeType.INTEGER => result = resultSet.getInt(1) - case LONG => + case AttributeType.LONG => result = resultSet.getLong(1) - case TIMESTAMP => + case AttributeType.TIMESTAMP => result = resultSet.getTimestamp(1).getTime - case DOUBLE => + case AttributeType.DOUBLE => result = resultSet.getDouble(1) - case BOOLEAN | STRING | ANY | _ => + case AttributeType.BOOLEAN | AttributeType.STRING | AttributeType.ANY | _ => throw new IllegalStateException("Unexpected value: " + attribute.getType) } resultSet.close() @@ -489,8 +486,8 @@ abstract class SQLSourceOpExec( if (min.get.equalsIgnoreCase("auto")) curLowerBound = fetchBatchByBoundary("MIN") else batchByAttribute.get.getType match { - case TIMESTAMP => curLowerBound = parseTimestamp(min.get).getTime - case LONG => curLowerBound = min.get.toLong + case AttributeType.TIMESTAMP => curLowerBound = parseTimestamp(min.get).getTime + case AttributeType.LONG => curLowerBound = min.get.toLong case _ => throw new IllegalArgumentException(s"Unsupported type ${batchByAttribute.get.getType}") } @@ -498,8 +495,8 @@ abstract class SQLSourceOpExec( if (max.get.equalsIgnoreCase("auto")) upperBound = fetchBatchByBoundary("MAX") else batchByAttribute.get.getType match { - case TIMESTAMP => upperBound = parseTimestamp(max.get).getTime - case LONG => upperBound = max.get.toLong + case AttributeType.TIMESTAMP => upperBound = parseTimestamp(max.get).getTime + case AttributeType.LONG => upperBound = max.get.toLong case _ => throw new IllegalArgumentException(s"Unsupported type ${batchByAttribute.get.getType}") } diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/asterixdb/AsterixDBSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/asterixdb/AsterixDBSourceOpExec.scala index babc756f8fe..8f2470a6157 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/asterixdb/AsterixDBSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/asterixdb/AsterixDBSourceOpExec.scala @@ -298,7 +298,7 @@ class AsterixDBSourceOpExec private[asterixdb] ( attribute.getType ) ) match { - case Success(timestamp: Timestamp) => parseField(timestamp, LONG).asInstanceOf[Number] + case Success(timestamp: Timestamp) => parseField(timestamp, AttributeType.LONG).asInstanceOf[Number] case Success(otherTypes) => otherTypes.asInstanceOf[Number] case Failure(_) => 0 } @@ -326,11 +326,11 @@ class AsterixDBSourceOpExec private[asterixdb] ( batchByAttribute match { case Some(attribute) => attribute.getType match { - case LONG | INTEGER | DOUBLE => + case AttributeType.LONG | AttributeType.INTEGER | AttributeType.DOUBLE => String.valueOf(value) - case TIMESTAMP => + case AttributeType.TIMESTAMP => "datetime('" + formatter.format(new Timestamp(value.longValue).toInstant) + "')" - case BOOLEAN | STRING | ANY | _ => + case AttributeType.BOOLEAN | AttributeType.STRING | AttributeType.ANY | _ => throw new IllegalArgumentException("Unexpected type: " + attribute.getType) } case None => diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpDesc.java b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpDesc.java index dc8e07afb7e..4939012334d 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpDesc.java +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpDesc.java @@ -6,7 +6,7 @@ import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp; import edu.uci.ics.amber.engine.architecture.deploysemantics.SchemaPropagationFunc; import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo; -import edu.uci.ics.amber.engine.common.tuple.AttributeTypeUtils; +import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils; import edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity; import edu.uci.ics.amber.engine.common.virtualidentity.WorkflowIdentity; import edu.uci.ics.amber.engine.common.workflow.InputPort; diff --git a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/BreakpointFault.scala b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/BreakpointFault.scala similarity index 72% rename from core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/BreakpointFault.scala rename to core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/BreakpointFault.scala index 339f447f6f2..26f4d36082e 100644 --- a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/BreakpointFault.scala +++ b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/BreakpointFault.scala @@ -3,12 +3,12 @@ // // Protofile syntax: PROTO3 -package edu.uci.ics.texera.web.workflowruntimestate +package edu.uci.ics.amber.engine.common.workflowruntimestate @SerialVersionUID(0L) final case class BreakpointFault( workerName: _root_.scala.Predef.String = "", - faultedTuple: _root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple] = _root_.scala.None + faultedTuple: _root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple] = _root_.scala.None ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[BreakpointFault] { @transient private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0 @@ -50,9 +50,9 @@ final case class BreakpointFault( }; } def withWorkerName(__v: _root_.scala.Predef.String): BreakpointFault = copy(workerName = __v) - def getFaultedTuple: edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple = faultedTuple.getOrElse(edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple.defaultInstance) + def getFaultedTuple: edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple = faultedTuple.getOrElse(edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple.defaultInstance) def clearFaultedTuple: BreakpointFault = copy(faultedTuple = _root_.scala.None) - def withFaultedTuple(__v: edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple): BreakpointFault = copy(faultedTuple = Option(__v)) + def withFaultedTuple(__v: edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple): BreakpointFault = copy(faultedTuple = Option(__v)) def getFieldByNumber(__fieldNumber: _root_.scala.Int): _root_.scala.Any = { (__fieldNumber: @_root_.scala.unchecked) match { case 1 => { @@ -70,15 +70,15 @@ final case class BreakpointFault( } } def toProtoString: _root_.scala.Predef.String = _root_.scalapb.TextFormat.printToSingleLineUnicodeString(this) - def companion = edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault - // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.texera.web.BreakpointFault]) + def companion = edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault + // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.amber.engine.common.BreakpointFault]) } -object BreakpointFault extends scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault] { - implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault] = this - def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault = { +object BreakpointFault extends scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault] { + implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault] = this + def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault = { var __workerName: _root_.scala.Predef.String = "" - var __faultedTuple: _root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple] = _root_.scala.None + var __faultedTuple: _root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple] = _root_.scala.None var _done__ = false while (!_done__) { val _tag__ = _input__.readTag() @@ -87,21 +87,21 @@ object BreakpointFault extends scalapb.GeneratedMessageCompanion[edu.uci.ics.tex case 10 => __workerName = _input__.readStringRequireUtf8() case 18 => - __faultedTuple = Option(__faultedTuple.fold(_root_.scalapb.LiteParser.readMessage[edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _))) + __faultedTuple = Option(__faultedTuple.fold(_root_.scalapb.LiteParser.readMessage[edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _))) case tag => _input__.skipField(tag) } } - edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault( + edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault( workerName = __workerName, faultedTuple = __faultedTuple ) } - implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault] = _root_.scalapb.descriptors.Reads{ + implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage eq scalaDescriptor), "FieldDescriptor does not match message type.") - edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault( + edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault( workerName = __fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).map(_.as[_root_.scala.Predef.String]).getOrElse(""), - faultedTuple = __fieldsMap.get(scalaDescriptor.findFieldByNumber(2).get).flatMap(_.as[_root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple]]) + faultedTuple = __fieldsMap.get(scalaDescriptor.findFieldByNumber(2).get).flatMap(_.as[_root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple]]) ) case _ => throw new RuntimeException("Expected PMessage") } @@ -110,16 +110,16 @@ object BreakpointFault extends scalapb.GeneratedMessageCompanion[edu.uci.ics.tex def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null (__number: @_root_.scala.unchecked) match { - case 2 => __out = edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple + case 2 => __out = edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple } __out } lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( - _root_.edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple + _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple ) def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) - lazy val defaultInstance = edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault( + lazy val defaultInstance = edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault( workerName = "", faultedTuple = _root_.scala.None ) @@ -207,13 +207,13 @@ object BreakpointFault extends scalapb.GeneratedMessageCompanion[edu.uci.ics.tex } } def toProtoString: _root_.scala.Predef.String = _root_.scalapb.TextFormat.printToSingleLineUnicodeString(this) - def companion = edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple - // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.texera.web.BreakpointFault.BreakpointTuple]) + def companion = edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple + // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.amber.engine.common.BreakpointFault.BreakpointTuple]) } - object BreakpointTuple extends scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple] { - implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple] = this - def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple = { + object BreakpointTuple extends scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple] { + implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple] = this + def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple = { var __id: _root_.scala.Long = 0L var __isInput: _root_.scala.Boolean = false val __tuple: _root_.scala.collection.immutable.VectorBuilder[_root_.scala.Predef.String] = new _root_.scala.collection.immutable.VectorBuilder[_root_.scala.Predef.String] @@ -231,33 +231,33 @@ object BreakpointFault extends scalapb.GeneratedMessageCompanion[edu.uci.ics.tex case tag => _input__.skipField(tag) } } - edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple( + edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple( id = __id, isInput = __isInput, tuple = __tuple.result() ) } - implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple] = _root_.scalapb.descriptors.Reads{ + implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage eq scalaDescriptor), "FieldDescriptor does not match message type.") - edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple( + edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple( id = __fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).map(_.as[_root_.scala.Long]).getOrElse(0L), isInput = __fieldsMap.get(scalaDescriptor.findFieldByNumber(2).get).map(_.as[_root_.scala.Boolean]).getOrElse(false), tuple = __fieldsMap.get(scalaDescriptor.findFieldByNumber(3).get).map(_.as[_root_.scala.Seq[_root_.scala.Predef.String]]).getOrElse(_root_.scala.Seq.empty) ) case _ => throw new RuntimeException("Expected PMessage") } - def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.javaDescriptor.getNestedTypes().get(0) - def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.scalaDescriptor.nestedMessages(0) + def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.javaDescriptor.getNestedTypes().get(0) + def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.scalaDescriptor.nestedMessages(0) def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) - lazy val defaultInstance = edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple( + lazy val defaultInstance = edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple( id = 0L, isInput = false, tuple = _root_.scala.Seq.empty ) - implicit class BreakpointTupleLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple](_l) { + implicit class BreakpointTupleLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple](_l) { def id: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Long] = field(_.id)((c_, f_) => c_.copy(id = f_)) def isInput: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.isInput)((c_, f_) => c_.copy(isInput = f_)) def tuple: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.tuple)((c_, f_) => c_.copy(tuple = f_)) @@ -269,27 +269,27 @@ object BreakpointFault extends scalapb.GeneratedMessageCompanion[edu.uci.ics.tex id: _root_.scala.Long, isInput: _root_.scala.Boolean, tuple: _root_.scala.Seq[_root_.scala.Predef.String] - ): _root_.edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple = _root_.edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple( + ): _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple = _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple( id, isInput, tuple ) - // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.texera.web.BreakpointFault.BreakpointTuple]) + // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.BreakpointFault.BreakpointTuple]) } - implicit class BreakpointFaultLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault](_l) { + implicit class BreakpointFaultLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault](_l) { def workerName: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.workerName)((c_, f_) => c_.copy(workerName = f_)) - def faultedTuple: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple] = field(_.getFaultedTuple)((c_, f_) => c_.copy(faultedTuple = Option(f_))) - def optionalFaultedTuple: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple]] = field(_.faultedTuple)((c_, f_) => c_.copy(faultedTuple = f_)) + def faultedTuple: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple] = field(_.getFaultedTuple)((c_, f_) => c_.copy(faultedTuple = Option(f_))) + def optionalFaultedTuple: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple]] = field(_.faultedTuple)((c_, f_) => c_.copy(faultedTuple = f_)) } final val WORKER_NAME_FIELD_NUMBER = 1 final val FAULTED_TUPLE_FIELD_NUMBER = 2 def of( workerName: _root_.scala.Predef.String, - faultedTuple: _root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault.BreakpointTuple] - ): _root_.edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault = _root_.edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault( + faultedTuple: _root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault.BreakpointTuple] + ): _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault = _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault( workerName, faultedTuple ) - // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.texera.web.BreakpointFault]) + // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.BreakpointFault]) } diff --git a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/EvaluatedValueList.scala b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/EvaluatedValueList.scala similarity index 80% rename from core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/EvaluatedValueList.scala rename to core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/EvaluatedValueList.scala index 9de71d164de..05e7737f95e 100644 --- a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/EvaluatedValueList.scala +++ b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/EvaluatedValueList.scala @@ -3,7 +3,7 @@ // // Protofile syntax: PROTO3 -package edu.uci.ics.texera.web.workflowruntimestate +package edu.uci.ics.amber.engine.common.workflowruntimestate @SerialVersionUID(0L) final case class EvaluatedValueList( @@ -51,13 +51,13 @@ final case class EvaluatedValueList( } } def toProtoString: _root_.scala.Predef.String = _root_.scalapb.TextFormat.printToSingleLineUnicodeString(this) - def companion = edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList - // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.texera.web.EvaluatedValueList]) + def companion = edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList + // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.amber.engine.common.EvaluatedValueList]) } -object EvaluatedValueList extends scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList] { - implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList] = this - def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList = { +object EvaluatedValueList extends scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList] { + implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList] = this + def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList = { val __values: _root_.scala.collection.immutable.VectorBuilder[edu.uci.ics.amber.engine.architecture.worker.controlreturns.EvaluatedValue] = new _root_.scala.collection.immutable.VectorBuilder[edu.uci.ics.amber.engine.architecture.worker.controlreturns.EvaluatedValue] var _done__ = false while (!_done__) { @@ -69,14 +69,14 @@ object EvaluatedValueList extends scalapb.GeneratedMessageCompanion[edu.uci.ics. case tag => _input__.skipField(tag) } } - edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList( + edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList( values = __values.result() ) } - implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList] = _root_.scalapb.descriptors.Reads{ + implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage eq scalaDescriptor), "FieldDescriptor does not match message type.") - edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList( + edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList( values = __fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).map(_.as[_root_.scala.Seq[edu.uci.ics.amber.engine.architecture.worker.controlreturns.EvaluatedValue]]).getOrElse(_root_.scala.Seq.empty) ) case _ => throw new RuntimeException("Expected PMessage") @@ -92,17 +92,17 @@ object EvaluatedValueList extends scalapb.GeneratedMessageCompanion[edu.uci.ics. } lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) - lazy val defaultInstance = edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList( + lazy val defaultInstance = edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList( values = _root_.scala.Seq.empty ) - implicit class EvaluatedValueListLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList](_l) { + implicit class EvaluatedValueListLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList](_l) { def values: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[edu.uci.ics.amber.engine.architecture.worker.controlreturns.EvaluatedValue]] = field(_.values)((c_, f_) => c_.copy(values = f_)) } final val VALUES_FIELD_NUMBER = 1 def of( values: _root_.scala.Seq[edu.uci.ics.amber.engine.architecture.worker.controlreturns.EvaluatedValue] - ): _root_.edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList = _root_.edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList( + ): _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList = _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList( values ) - // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.texera.web.EvaluatedValueList]) + // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.EvaluatedValueList]) } diff --git a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/ExecutionBreakpointStore.scala b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/ExecutionBreakpointStore.scala similarity index 53% rename from core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/ExecutionBreakpointStore.scala rename to core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/ExecutionBreakpointStore.scala index 1e26f8b54fd..f20f8ae7e75 100644 --- a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/ExecutionBreakpointStore.scala +++ b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/ExecutionBreakpointStore.scala @@ -3,18 +3,18 @@ // // Protofile syntax: PROTO3 -package edu.uci.ics.texera.web.workflowruntimestate +package edu.uci.ics.amber.engine.common.workflowruntimestate @SerialVersionUID(0L) final case class ExecutionBreakpointStore( - operatorInfo: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints] = _root_.scala.collection.immutable.Map.empty + operatorInfo: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints] = _root_.scala.collection.immutable.Map.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ExecutionBreakpointStore] { @transient private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0 private[this] def __computeSerializedValue(): _root_.scala.Int = { var __size = 0 operatorInfo.foreach { __item => - val __value = edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore._typemapper_operatorInfo.toBase(__item) + val __value = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore._typemapper_operatorInfo.toBase(__item) __size += 1 + _root_.com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize } __size @@ -29,55 +29,55 @@ final case class ExecutionBreakpointStore( } def writeTo(`_output__`: _root_.com.google.protobuf.CodedOutputStream): _root_.scala.Unit = { operatorInfo.foreach { __v => - val __m = edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore._typemapper_operatorInfo.toBase(__v) + val __m = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore._typemapper_operatorInfo.toBase(__v) _output__.writeTag(1, 2) _output__.writeUInt32NoTag(__m.serializedSize) __m.writeTo(_output__) }; } def clearOperatorInfo = copy(operatorInfo = _root_.scala.collection.immutable.Map.empty) - def addOperatorInfo(__vs: (_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints)*): ExecutionBreakpointStore = addAllOperatorInfo(__vs) - def addAllOperatorInfo(__vs: Iterable[(_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints)]): ExecutionBreakpointStore = copy(operatorInfo = operatorInfo ++ __vs) - def withOperatorInfo(__v: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints]): ExecutionBreakpointStore = copy(operatorInfo = __v) + def addOperatorInfo(__vs: (_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints)*): ExecutionBreakpointStore = addAllOperatorInfo(__vs) + def addAllOperatorInfo(__vs: Iterable[(_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints)]): ExecutionBreakpointStore = copy(operatorInfo = operatorInfo ++ __vs) + def withOperatorInfo(__v: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints]): ExecutionBreakpointStore = copy(operatorInfo = __v) def getFieldByNumber(__fieldNumber: _root_.scala.Int): _root_.scala.Any = { (__fieldNumber: @_root_.scala.unchecked) match { - case 1 => operatorInfo.iterator.map(edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore._typemapper_operatorInfo.toBase(_)).toSeq + case 1 => operatorInfo.iterator.map(edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore._typemapper_operatorInfo.toBase(_)).toSeq } } def getField(__field: _root_.scalapb.descriptors.FieldDescriptor): _root_.scalapb.descriptors.PValue = { _root_.scala.Predef.require(__field.containingMessage eq companion.scalaDescriptor) (__field.number: @_root_.scala.unchecked) match { - case 1 => _root_.scalapb.descriptors.PRepeated(operatorInfo.iterator.map(edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore._typemapper_operatorInfo.toBase(_).toPMessage).toVector) + case 1 => _root_.scalapb.descriptors.PRepeated(operatorInfo.iterator.map(edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore._typemapper_operatorInfo.toBase(_).toPMessage).toVector) } } def toProtoString: _root_.scala.Predef.String = _root_.scalapb.TextFormat.printToSingleLineUnicodeString(this) - def companion = edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore - // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.texera.web.ExecutionBreakpointStore]) + def companion = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore + // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.amber.engine.common.ExecutionBreakpointStore]) } -object ExecutionBreakpointStore extends scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore] { - implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore] = this - def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore = { - val __operatorInfo: _root_.scala.collection.mutable.Builder[(_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints), _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints]] = _root_.scala.collection.immutable.Map.newBuilder[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints] +object ExecutionBreakpointStore extends scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore] { + implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore] = this + def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore = { + val __operatorInfo: _root_.scala.collection.mutable.Builder[(_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints), _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints]] = _root_.scala.collection.immutable.Map.newBuilder[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints] var _done__ = false while (!_done__) { val _tag__ = _input__.readTag() _tag__ match { case 0 => _done__ = true case 10 => - __operatorInfo += edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore._typemapper_operatorInfo.toCustom(_root_.scalapb.LiteParser.readMessage[edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry](_input__)) + __operatorInfo += edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore._typemapper_operatorInfo.toCustom(_root_.scalapb.LiteParser.readMessage[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry](_input__)) case tag => _input__.skipField(tag) } } - edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore( + edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore( operatorInfo = __operatorInfo.result() ) } - implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore] = _root_.scalapb.descriptors.Reads{ + implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage eq scalaDescriptor), "FieldDescriptor does not match message type.") - edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore( - operatorInfo = __fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).map(_.as[_root_.scala.Seq[edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry]]).getOrElse(_root_.scala.Seq.empty).iterator.map(edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore._typemapper_operatorInfo.toCustom(_)).toMap + edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore( + operatorInfo = __fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).map(_.as[_root_.scala.Seq[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry]]).getOrElse(_root_.scala.Seq.empty).iterator.map(edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore._typemapper_operatorInfo.toCustom(_)).toMap ) case _ => throw new RuntimeException("Expected PMessage") } @@ -86,22 +86,22 @@ object ExecutionBreakpointStore extends scalapb.GeneratedMessageCompanion[edu.uc def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null (__number: @_root_.scala.unchecked) match { - case 1 => __out = edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry + case 1 => __out = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry } __out } lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( - _root_.edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry + _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry ) def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) - lazy val defaultInstance = edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore( + lazy val defaultInstance = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore( operatorInfo = _root_.scala.collection.immutable.Map.empty ) @SerialVersionUID(0L) final case class OperatorInfoEntry( key: _root_.scala.Predef.String = "", - value: _root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints] = _root_.scala.None + value: _root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints] = _root_.scala.None ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[OperatorInfoEntry] { @transient private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0 @@ -143,9 +143,9 @@ object ExecutionBreakpointStore extends scalapb.GeneratedMessageCompanion[edu.uc }; } def withKey(__v: _root_.scala.Predef.String): OperatorInfoEntry = copy(key = __v) - def getValue: edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints = value.getOrElse(edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints.defaultInstance) + def getValue: edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints = value.getOrElse(edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints.defaultInstance) def clearValue: OperatorInfoEntry = copy(value = _root_.scala.None) - def withValue(__v: edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints): OperatorInfoEntry = copy(value = Option(__v)) + def withValue(__v: edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints): OperatorInfoEntry = copy(value = Option(__v)) def getFieldByNumber(__fieldNumber: _root_.scala.Int): _root_.scala.Any = { (__fieldNumber: @_root_.scala.unchecked) match { case 1 => { @@ -163,15 +163,15 @@ object ExecutionBreakpointStore extends scalapb.GeneratedMessageCompanion[edu.uc } } def toProtoString: _root_.scala.Predef.String = _root_.scalapb.TextFormat.printToSingleLineUnicodeString(this) - def companion = edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry - // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.texera.web.ExecutionBreakpointStore.OperatorInfoEntry]) + def companion = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry + // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.amber.engine.common.ExecutionBreakpointStore.OperatorInfoEntry]) } - object OperatorInfoEntry extends scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry] { - implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry] = this - def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry = { + object OperatorInfoEntry extends scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry] { + implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry] = this + def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry = { var __key: _root_.scala.Predef.String = "" - var __value: _root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints] = _root_.scala.None + var __value: _root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints] = _root_.scala.None var _done__ = false while (!_done__) { val _tag__ = _input__.readTag() @@ -180,69 +180,69 @@ object ExecutionBreakpointStore extends scalapb.GeneratedMessageCompanion[edu.uc case 10 => __key = _input__.readStringRequireUtf8() case 18 => - __value = Option(__value.fold(_root_.scalapb.LiteParser.readMessage[edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _))) + __value = Option(__value.fold(_root_.scalapb.LiteParser.readMessage[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _))) case tag => _input__.skipField(tag) } } - edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry( + edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry( key = __key, value = __value ) } - implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry] = _root_.scalapb.descriptors.Reads{ + implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage eq scalaDescriptor), "FieldDescriptor does not match message type.") - edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry( + edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry( key = __fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).map(_.as[_root_.scala.Predef.String]).getOrElse(""), - value = __fieldsMap.get(scalaDescriptor.findFieldByNumber(2).get).flatMap(_.as[_root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints]]) + value = __fieldsMap.get(scalaDescriptor.findFieldByNumber(2).get).flatMap(_.as[_root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints]]) ) case _ => throw new RuntimeException("Expected PMessage") } - def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore.javaDescriptor.getNestedTypes().get(0) - def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore.scalaDescriptor.nestedMessages(0) + def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore.javaDescriptor.getNestedTypes().get(0) + def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore.scalaDescriptor.nestedMessages(0) def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null (__number: @_root_.scala.unchecked) match { - case 2 => __out = edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints + case 2 => __out = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints } __out } lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) - lazy val defaultInstance = edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry( + lazy val defaultInstance = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry( key = "", value = _root_.scala.None ) - implicit class OperatorInfoEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry](_l) { + implicit class OperatorInfoEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) - def value: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints] = field(_.getValue)((c_, f_) => c_.copy(value = Option(f_))) - def optionalValue: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints]] = field(_.value)((c_, f_) => c_.copy(value = f_)) + def value: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints] = field(_.getValue)((c_, f_) => c_.copy(value = Option(f_))) + def optionalValue: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints]] = field(_.value)((c_, f_) => c_.copy(value = f_)) } final val KEY_FIELD_NUMBER = 1 final val VALUE_FIELD_NUMBER = 2 @transient - implicit val keyValueMapper: _root_.scalapb.TypeMapper[edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry, (_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints)] = - _root_.scalapb.TypeMapper[edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry, (_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints)](__m => (__m.key, __m.getValue))(__p => edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry(__p._1, Some(__p._2))) + implicit val keyValueMapper: _root_.scalapb.TypeMapper[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry, (_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints)] = + _root_.scalapb.TypeMapper[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry, (_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints)](__m => (__m.key, __m.getValue))(__p => edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry(__p._1, Some(__p._2))) def of( key: _root_.scala.Predef.String, - value: _root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints] - ): _root_.edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry = _root_.edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry( + value: _root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints] + ): _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry = _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry( key, value ) - // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.texera.web.ExecutionBreakpointStore.OperatorInfoEntry]) + // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.ExecutionBreakpointStore.OperatorInfoEntry]) } - implicit class ExecutionBreakpointStoreLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore](_l) { - def operatorInfo: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints]] = field(_.operatorInfo)((c_, f_) => c_.copy(operatorInfo = f_)) + implicit class ExecutionBreakpointStoreLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore](_l) { + def operatorInfo: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints]] = field(_.operatorInfo)((c_, f_) => c_.copy(operatorInfo = f_)) } final val OPERATOR_INFO_FIELD_NUMBER = 1 @transient - private[workflowruntimestate] val _typemapper_operatorInfo: _root_.scalapb.TypeMapper[edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry, (_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints)] = implicitly[_root_.scalapb.TypeMapper[edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry, (_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints)]] + private[workflowruntimestate] val _typemapper_operatorInfo: _root_.scalapb.TypeMapper[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry, (_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints)] = implicitly[_root_.scalapb.TypeMapper[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore.OperatorInfoEntry, (_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints)]] def of( - operatorInfo: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints] - ): _root_.edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore = _root_.edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore( + operatorInfo: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints] + ): _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore = _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore( operatorInfo ) - // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.texera.web.ExecutionBreakpointStore]) + // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.ExecutionBreakpointStore]) } diff --git a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/ExecutionConsoleStore.scala b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/ExecutionConsoleStore.scala similarity index 54% rename from core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/ExecutionConsoleStore.scala rename to core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/ExecutionConsoleStore.scala index 0999b0eb415..c6c54a195dd 100644 --- a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/ExecutionConsoleStore.scala +++ b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/ExecutionConsoleStore.scala @@ -3,18 +3,18 @@ // // Protofile syntax: PROTO3 -package edu.uci.ics.texera.web.workflowruntimestate +package edu.uci.ics.amber.engine.common.workflowruntimestate @SerialVersionUID(0L) final case class ExecutionConsoleStore( - operatorConsole: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole] = _root_.scala.collection.immutable.Map.empty + operatorConsole: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole] = _root_.scala.collection.immutable.Map.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ExecutionConsoleStore] { @transient private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0 private[this] def __computeSerializedValue(): _root_.scala.Int = { var __size = 0 operatorConsole.foreach { __item => - val __value = edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore._typemapper_operatorConsole.toBase(__item) + val __value = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore._typemapper_operatorConsole.toBase(__item) __size += 1 + _root_.com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize } __size @@ -29,55 +29,55 @@ final case class ExecutionConsoleStore( } def writeTo(`_output__`: _root_.com.google.protobuf.CodedOutputStream): _root_.scala.Unit = { operatorConsole.foreach { __v => - val __m = edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore._typemapper_operatorConsole.toBase(__v) + val __m = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore._typemapper_operatorConsole.toBase(__v) _output__.writeTag(1, 2) _output__.writeUInt32NoTag(__m.serializedSize) __m.writeTo(_output__) }; } def clearOperatorConsole = copy(operatorConsole = _root_.scala.collection.immutable.Map.empty) - def addOperatorConsole(__vs: (_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole)*): ExecutionConsoleStore = addAllOperatorConsole(__vs) - def addAllOperatorConsole(__vs: Iterable[(_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole)]): ExecutionConsoleStore = copy(operatorConsole = operatorConsole ++ __vs) - def withOperatorConsole(__v: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole]): ExecutionConsoleStore = copy(operatorConsole = __v) + def addOperatorConsole(__vs: (_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole)*): ExecutionConsoleStore = addAllOperatorConsole(__vs) + def addAllOperatorConsole(__vs: Iterable[(_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole)]): ExecutionConsoleStore = copy(operatorConsole = operatorConsole ++ __vs) + def withOperatorConsole(__v: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole]): ExecutionConsoleStore = copy(operatorConsole = __v) def getFieldByNumber(__fieldNumber: _root_.scala.Int): _root_.scala.Any = { (__fieldNumber: @_root_.scala.unchecked) match { - case 1 => operatorConsole.iterator.map(edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore._typemapper_operatorConsole.toBase(_)).toSeq + case 1 => operatorConsole.iterator.map(edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore._typemapper_operatorConsole.toBase(_)).toSeq } } def getField(__field: _root_.scalapb.descriptors.FieldDescriptor): _root_.scalapb.descriptors.PValue = { _root_.scala.Predef.require(__field.containingMessage eq companion.scalaDescriptor) (__field.number: @_root_.scala.unchecked) match { - case 1 => _root_.scalapb.descriptors.PRepeated(operatorConsole.iterator.map(edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore._typemapper_operatorConsole.toBase(_).toPMessage).toVector) + case 1 => _root_.scalapb.descriptors.PRepeated(operatorConsole.iterator.map(edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore._typemapper_operatorConsole.toBase(_).toPMessage).toVector) } } def toProtoString: _root_.scala.Predef.String = _root_.scalapb.TextFormat.printToSingleLineUnicodeString(this) - def companion = edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore - // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.texera.web.ExecutionConsoleStore]) + def companion = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore + // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.amber.engine.common.ExecutionConsoleStore]) } -object ExecutionConsoleStore extends scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore] { - implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore] = this - def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore = { - val __operatorConsole: _root_.scala.collection.mutable.Builder[(_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole), _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole]] = _root_.scala.collection.immutable.Map.newBuilder[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole] +object ExecutionConsoleStore extends scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore] { + implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore] = this + def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore = { + val __operatorConsole: _root_.scala.collection.mutable.Builder[(_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole), _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole]] = _root_.scala.collection.immutable.Map.newBuilder[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole] var _done__ = false while (!_done__) { val _tag__ = _input__.readTag() _tag__ match { case 0 => _done__ = true case 10 => - __operatorConsole += edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore._typemapper_operatorConsole.toCustom(_root_.scalapb.LiteParser.readMessage[edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry](_input__)) + __operatorConsole += edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore._typemapper_operatorConsole.toCustom(_root_.scalapb.LiteParser.readMessage[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry](_input__)) case tag => _input__.skipField(tag) } } - edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore( + edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore( operatorConsole = __operatorConsole.result() ) } - implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore] = _root_.scalapb.descriptors.Reads{ + implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage eq scalaDescriptor), "FieldDescriptor does not match message type.") - edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore( - operatorConsole = __fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).map(_.as[_root_.scala.Seq[edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry]]).getOrElse(_root_.scala.Seq.empty).iterator.map(edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore._typemapper_operatorConsole.toCustom(_)).toMap + edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore( + operatorConsole = __fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).map(_.as[_root_.scala.Seq[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry]]).getOrElse(_root_.scala.Seq.empty).iterator.map(edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore._typemapper_operatorConsole.toCustom(_)).toMap ) case _ => throw new RuntimeException("Expected PMessage") } @@ -86,22 +86,22 @@ object ExecutionConsoleStore extends scalapb.GeneratedMessageCompanion[edu.uci.i def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null (__number: @_root_.scala.unchecked) match { - case 1 => __out = edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry + case 1 => __out = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry } __out } lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( - _root_.edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry + _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry ) def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) - lazy val defaultInstance = edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore( + lazy val defaultInstance = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore( operatorConsole = _root_.scala.collection.immutable.Map.empty ) @SerialVersionUID(0L) final case class OperatorConsoleEntry( key: _root_.scala.Predef.String = "", - value: _root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole] = _root_.scala.None + value: _root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole] = _root_.scala.None ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[OperatorConsoleEntry] { @transient private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0 @@ -143,9 +143,9 @@ object ExecutionConsoleStore extends scalapb.GeneratedMessageCompanion[edu.uci.i }; } def withKey(__v: _root_.scala.Predef.String): OperatorConsoleEntry = copy(key = __v) - def getValue: edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole = value.getOrElse(edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.defaultInstance) + def getValue: edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole = value.getOrElse(edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.defaultInstance) def clearValue: OperatorConsoleEntry = copy(value = _root_.scala.None) - def withValue(__v: edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole): OperatorConsoleEntry = copy(value = Option(__v)) + def withValue(__v: edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole): OperatorConsoleEntry = copy(value = Option(__v)) def getFieldByNumber(__fieldNumber: _root_.scala.Int): _root_.scala.Any = { (__fieldNumber: @_root_.scala.unchecked) match { case 1 => { @@ -163,15 +163,15 @@ object ExecutionConsoleStore extends scalapb.GeneratedMessageCompanion[edu.uci.i } } def toProtoString: _root_.scala.Predef.String = _root_.scalapb.TextFormat.printToSingleLineUnicodeString(this) - def companion = edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry - // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.texera.web.ExecutionConsoleStore.OperatorConsoleEntry]) + def companion = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry + // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.amber.engine.common.ExecutionConsoleStore.OperatorConsoleEntry]) } - object OperatorConsoleEntry extends scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry] { - implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry] = this - def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry = { + object OperatorConsoleEntry extends scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry] { + implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry] = this + def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry = { var __key: _root_.scala.Predef.String = "" - var __value: _root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole] = _root_.scala.None + var __value: _root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole] = _root_.scala.None var _done__ = false while (!_done__) { val _tag__ = _input__.readTag() @@ -180,69 +180,69 @@ object ExecutionConsoleStore extends scalapb.GeneratedMessageCompanion[edu.uci.i case 10 => __key = _input__.readStringRequireUtf8() case 18 => - __value = Option(__value.fold(_root_.scalapb.LiteParser.readMessage[edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _))) + __value = Option(__value.fold(_root_.scalapb.LiteParser.readMessage[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _))) case tag => _input__.skipField(tag) } } - edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry( + edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry( key = __key, value = __value ) } - implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry] = _root_.scalapb.descriptors.Reads{ + implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage eq scalaDescriptor), "FieldDescriptor does not match message type.") - edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry( + edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry( key = __fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).map(_.as[_root_.scala.Predef.String]).getOrElse(""), - value = __fieldsMap.get(scalaDescriptor.findFieldByNumber(2).get).flatMap(_.as[_root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole]]) + value = __fieldsMap.get(scalaDescriptor.findFieldByNumber(2).get).flatMap(_.as[_root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole]]) ) case _ => throw new RuntimeException("Expected PMessage") } - def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore.javaDescriptor.getNestedTypes().get(0) - def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore.scalaDescriptor.nestedMessages(0) + def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore.javaDescriptor.getNestedTypes().get(0) + def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore.scalaDescriptor.nestedMessages(0) def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null (__number: @_root_.scala.unchecked) match { - case 2 => __out = edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole + case 2 => __out = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole } __out } lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) - lazy val defaultInstance = edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry( + lazy val defaultInstance = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry( key = "", value = _root_.scala.None ) - implicit class OperatorConsoleEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry](_l) { + implicit class OperatorConsoleEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) - def value: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole] = field(_.getValue)((c_, f_) => c_.copy(value = Option(f_))) - def optionalValue: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole]] = field(_.value)((c_, f_) => c_.copy(value = f_)) + def value: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole] = field(_.getValue)((c_, f_) => c_.copy(value = Option(f_))) + def optionalValue: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole]] = field(_.value)((c_, f_) => c_.copy(value = f_)) } final val KEY_FIELD_NUMBER = 1 final val VALUE_FIELD_NUMBER = 2 @transient - implicit val keyValueMapper: _root_.scalapb.TypeMapper[edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry, (_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole)] = - _root_.scalapb.TypeMapper[edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry, (_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole)](__m => (__m.key, __m.getValue))(__p => edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry(__p._1, Some(__p._2))) + implicit val keyValueMapper: _root_.scalapb.TypeMapper[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry, (_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole)] = + _root_.scalapb.TypeMapper[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry, (_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole)](__m => (__m.key, __m.getValue))(__p => edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry(__p._1, Some(__p._2))) def of( key: _root_.scala.Predef.String, - value: _root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole] - ): _root_.edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry = _root_.edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry( + value: _root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole] + ): _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry = _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry( key, value ) - // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.texera.web.ExecutionConsoleStore.OperatorConsoleEntry]) + // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.ExecutionConsoleStore.OperatorConsoleEntry]) } - implicit class ExecutionConsoleStoreLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore](_l) { - def operatorConsole: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole]] = field(_.operatorConsole)((c_, f_) => c_.copy(operatorConsole = f_)) + implicit class ExecutionConsoleStoreLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore](_l) { + def operatorConsole: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole]] = field(_.operatorConsole)((c_, f_) => c_.copy(operatorConsole = f_)) } final val OPERATOR_CONSOLE_FIELD_NUMBER = 1 @transient - private[workflowruntimestate] val _typemapper_operatorConsole: _root_.scalapb.TypeMapper[edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry, (_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole)] = implicitly[_root_.scalapb.TypeMapper[edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry, (_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole)]] + private[workflowruntimestate] val _typemapper_operatorConsole: _root_.scalapb.TypeMapper[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry, (_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole)] = implicitly[_root_.scalapb.TypeMapper[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore.OperatorConsoleEntry, (_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole)]] def of( - operatorConsole: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole] - ): _root_.edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore = _root_.edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore( + operatorConsole: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole] + ): _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore = _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore( operatorConsole ) - // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.texera.web.ExecutionConsoleStore]) + // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.ExecutionConsoleStore]) } diff --git a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/ExecutionMetadataStore.scala b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/ExecutionMetadataStore.scala similarity index 66% rename from core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/ExecutionMetadataStore.scala rename to core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/ExecutionMetadataStore.scala index 2ff72aac9d5..3c397d55884 100644 --- a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/ExecutionMetadataStore.scala +++ b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/ExecutionMetadataStore.scala @@ -3,12 +3,12 @@ // // Protofile syntax: PROTO3 -package edu.uci.ics.texera.web.workflowruntimestate +package edu.uci.ics.amber.engine.common.workflowruntimestate @SerialVersionUID(0L) final case class ExecutionMetadataStore( - state: edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState = edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.UNINITIALIZED, - fatalErrors: _root_.scala.Seq[edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError] = _root_.scala.Seq.empty, + state: edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState = edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.UNINITIALIZED, + fatalErrors: _root_.scala.Seq[edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError] = _root_.scala.Seq.empty, executionId: edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity = edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity.defaultInstance, isRecovering: _root_.scala.Boolean = false ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ExecutionMetadataStore] { @@ -79,11 +79,11 @@ final case class ExecutionMetadataStore( } }; } - def withState(__v: edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState): ExecutionMetadataStore = copy(state = __v) + def withState(__v: edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState): ExecutionMetadataStore = copy(state = __v) def clearFatalErrors = copy(fatalErrors = _root_.scala.Seq.empty) - def addFatalErrors(__vs: edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError*): ExecutionMetadataStore = addAllFatalErrors(__vs) - def addAllFatalErrors(__vs: Iterable[edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError]): ExecutionMetadataStore = copy(fatalErrors = fatalErrors ++ __vs) - def withFatalErrors(__v: _root_.scala.Seq[edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError]): ExecutionMetadataStore = copy(fatalErrors = __v) + def addFatalErrors(__vs: edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError*): ExecutionMetadataStore = addAllFatalErrors(__vs) + def addAllFatalErrors(__vs: Iterable[edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError]): ExecutionMetadataStore = copy(fatalErrors = fatalErrors ++ __vs) + def withFatalErrors(__v: _root_.scala.Seq[edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError]): ExecutionMetadataStore = copy(fatalErrors = __v) def withExecutionId(__v: edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity): ExecutionMetadataStore = copy(executionId = __v) def withIsRecovering(__v: _root_.scala.Boolean): ExecutionMetadataStore = copy(isRecovering = __v) def getFieldByNumber(__fieldNumber: _root_.scala.Int): _root_.scala.Any = { @@ -113,15 +113,15 @@ final case class ExecutionMetadataStore( } } def toProtoString: _root_.scala.Predef.String = _root_.scalapb.TextFormat.printToSingleLineUnicodeString(this) - def companion = edu.uci.ics.texera.web.workflowruntimestate.ExecutionMetadataStore - // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.texera.web.ExecutionMetadataStore]) + def companion = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionMetadataStore + // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.amber.engine.common.ExecutionMetadataStore]) } -object ExecutionMetadataStore extends scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.ExecutionMetadataStore] { - implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.ExecutionMetadataStore] = this - def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.texera.web.workflowruntimestate.ExecutionMetadataStore = { - var __state: edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState = edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.UNINITIALIZED - val __fatalErrors: _root_.scala.collection.immutable.VectorBuilder[edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError] = new _root_.scala.collection.immutable.VectorBuilder[edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError] +object ExecutionMetadataStore extends scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionMetadataStore] { + implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionMetadataStore] = this + def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionMetadataStore = { + var __state: edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState = edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.UNINITIALIZED + val __fatalErrors: _root_.scala.collection.immutable.VectorBuilder[edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError] = new _root_.scala.collection.immutable.VectorBuilder[edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError] var __executionId: _root_.scala.Option[edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity] = _root_.scala.None var __isRecovering: _root_.scala.Boolean = false var _done__ = false @@ -130,9 +130,9 @@ object ExecutionMetadataStore extends scalapb.GeneratedMessageCompanion[edu.uci. _tag__ match { case 0 => _done__ = true case 8 => - __state = edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.fromValue(_input__.readEnum()) + __state = edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.fromValue(_input__.readEnum()) case 18 => - __fatalErrors += _root_.scalapb.LiteParser.readMessage[edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError](_input__) + __fatalErrors += _root_.scalapb.LiteParser.readMessage[edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError](_input__) case 26 => __executionId = _root_.scala.Some(__executionId.fold(_root_.scalapb.LiteParser.readMessage[edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _))) case 32 => @@ -140,19 +140,19 @@ object ExecutionMetadataStore extends scalapb.GeneratedMessageCompanion[edu.uci. case tag => _input__.skipField(tag) } } - edu.uci.ics.texera.web.workflowruntimestate.ExecutionMetadataStore( + edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionMetadataStore( state = __state, fatalErrors = __fatalErrors.result(), executionId = __executionId.getOrElse(edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity.defaultInstance), isRecovering = __isRecovering ) } - implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.texera.web.workflowruntimestate.ExecutionMetadataStore] = _root_.scalapb.descriptors.Reads{ + implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionMetadataStore] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage eq scalaDescriptor), "FieldDescriptor does not match message type.") - edu.uci.ics.texera.web.workflowruntimestate.ExecutionMetadataStore( - state = edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.fromValue(__fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).map(_.as[_root_.scalapb.descriptors.EnumValueDescriptor]).getOrElse(edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.UNINITIALIZED.scalaValueDescriptor).number), - fatalErrors = __fieldsMap.get(scalaDescriptor.findFieldByNumber(2).get).map(_.as[_root_.scala.Seq[edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError]]).getOrElse(_root_.scala.Seq.empty), + edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionMetadataStore( + state = edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.fromValue(__fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).map(_.as[_root_.scalapb.descriptors.EnumValueDescriptor]).getOrElse(edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.UNINITIALIZED.scalaValueDescriptor).number), + fatalErrors = __fieldsMap.get(scalaDescriptor.findFieldByNumber(2).get).map(_.as[_root_.scala.Seq[edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError]]).getOrElse(_root_.scala.Seq.empty), executionId = __fieldsMap.get(scalaDescriptor.findFieldByNumber(3).get).map(_.as[edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity]).getOrElse(edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity.defaultInstance), isRecovering = __fieldsMap.get(scalaDescriptor.findFieldByNumber(4).get).map(_.as[_root_.scala.Boolean]).getOrElse(false) ) @@ -163,7 +163,7 @@ object ExecutionMetadataStore extends scalapb.GeneratedMessageCompanion[edu.uci. def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null (__number: @_root_.scala.unchecked) match { - case 2 => __out = edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError + case 2 => __out = edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError case 3 => __out = edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity } __out @@ -171,18 +171,18 @@ object ExecutionMetadataStore extends scalapb.GeneratedMessageCompanion[edu.uci. lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = { (__fieldNumber: @_root_.scala.unchecked) match { - case 1 => edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState + case 1 => edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState } } - lazy val defaultInstance = edu.uci.ics.texera.web.workflowruntimestate.ExecutionMetadataStore( - state = edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.UNINITIALIZED, + lazy val defaultInstance = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionMetadataStore( + state = edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.UNINITIALIZED, fatalErrors = _root_.scala.Seq.empty, executionId = edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity.defaultInstance, isRecovering = false ) - implicit class ExecutionMetadataStoreLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.ExecutionMetadataStore]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.ExecutionMetadataStore](_l) { - def state: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState] = field(_.state)((c_, f_) => c_.copy(state = f_)) - def fatalErrors: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError]] = field(_.fatalErrors)((c_, f_) => c_.copy(fatalErrors = f_)) + implicit class ExecutionMetadataStoreLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionMetadataStore]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionMetadataStore](_l) { + def state: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState] = field(_.state)((c_, f_) => c_.copy(state = f_)) + def fatalErrors: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError]] = field(_.fatalErrors)((c_, f_) => c_.copy(fatalErrors = f_)) def executionId: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity] = field(_.executionId)((c_, f_) => c_.copy(executionId = f_)) def isRecovering: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Boolean] = field(_.isRecovering)((c_, f_) => c_.copy(isRecovering = f_)) } @@ -191,15 +191,15 @@ object ExecutionMetadataStore extends scalapb.GeneratedMessageCompanion[edu.uci. final val EXECUTIONID_FIELD_NUMBER = 3 final val IS_RECOVERING_FIELD_NUMBER = 4 def of( - state: edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState, - fatalErrors: _root_.scala.Seq[edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError], + state: edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState, + fatalErrors: _root_.scala.Seq[edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError], executionId: edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity, isRecovering: _root_.scala.Boolean - ): _root_.edu.uci.ics.texera.web.workflowruntimestate.ExecutionMetadataStore = _root_.edu.uci.ics.texera.web.workflowruntimestate.ExecutionMetadataStore( + ): _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionMetadataStore = _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionMetadataStore( state, fatalErrors, executionId, isRecovering ) - // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.texera.web.ExecutionMetadataStore]) + // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.ExecutionMetadataStore]) } diff --git a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/ExecutionStatsStore.scala b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/ExecutionStatsStore.scala similarity index 58% rename from core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/ExecutionStatsStore.scala rename to core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/ExecutionStatsStore.scala index d8c9294529f..bb3dbb30049 100644 --- a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/ExecutionStatsStore.scala +++ b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/ExecutionStatsStore.scala @@ -3,14 +3,14 @@ // // Protofile syntax: PROTO3 -package edu.uci.ics.texera.web.workflowruntimestate +package edu.uci.ics.amber.engine.common.workflowruntimestate @SerialVersionUID(0L) final case class ExecutionStatsStore( startTimeStamp: _root_.scala.Long = 0L, endTimeStamp: _root_.scala.Long = 0L, - operatorInfo: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics] = _root_.scala.collection.immutable.Map.empty, - operatorWorkerMapping: _root_.scala.Seq[edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping] = _root_.scala.Seq.empty + operatorInfo: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics] = _root_.scala.collection.immutable.Map.empty, + operatorWorkerMapping: _root_.scala.Seq[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping] = _root_.scala.Seq.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[ExecutionStatsStore] { @transient private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0 @@ -31,7 +31,7 @@ final case class ExecutionStatsStore( } }; operatorInfo.foreach { __item => - val __value = edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore._typemapper_operatorInfo.toBase(__item) + val __value = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore._typemapper_operatorInfo.toBase(__item) __size += 1 + _root_.com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize } operatorWorkerMapping.foreach { __item => @@ -62,7 +62,7 @@ final case class ExecutionStatsStore( } }; operatorInfo.foreach { __v => - val __m = edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore._typemapper_operatorInfo.toBase(__v) + val __m = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore._typemapper_operatorInfo.toBase(__v) _output__.writeTag(3, 2) _output__.writeUInt32NoTag(__m.serializedSize) __m.writeTo(_output__) @@ -77,13 +77,13 @@ final case class ExecutionStatsStore( def withStartTimeStamp(__v: _root_.scala.Long): ExecutionStatsStore = copy(startTimeStamp = __v) def withEndTimeStamp(__v: _root_.scala.Long): ExecutionStatsStore = copy(endTimeStamp = __v) def clearOperatorInfo = copy(operatorInfo = _root_.scala.collection.immutable.Map.empty) - def addOperatorInfo(__vs: (_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics)*): ExecutionStatsStore = addAllOperatorInfo(__vs) - def addAllOperatorInfo(__vs: Iterable[(_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics)]): ExecutionStatsStore = copy(operatorInfo = operatorInfo ++ __vs) - def withOperatorInfo(__v: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics]): ExecutionStatsStore = copy(operatorInfo = __v) + def addOperatorInfo(__vs: (_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics)*): ExecutionStatsStore = addAllOperatorInfo(__vs) + def addAllOperatorInfo(__vs: Iterable[(_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics)]): ExecutionStatsStore = copy(operatorInfo = operatorInfo ++ __vs) + def withOperatorInfo(__v: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics]): ExecutionStatsStore = copy(operatorInfo = __v) def clearOperatorWorkerMapping = copy(operatorWorkerMapping = _root_.scala.Seq.empty) - def addOperatorWorkerMapping(__vs: edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping*): ExecutionStatsStore = addAllOperatorWorkerMapping(__vs) - def addAllOperatorWorkerMapping(__vs: Iterable[edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping]): ExecutionStatsStore = copy(operatorWorkerMapping = operatorWorkerMapping ++ __vs) - def withOperatorWorkerMapping(__v: _root_.scala.Seq[edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping]): ExecutionStatsStore = copy(operatorWorkerMapping = __v) + def addOperatorWorkerMapping(__vs: edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping*): ExecutionStatsStore = addAllOperatorWorkerMapping(__vs) + def addAllOperatorWorkerMapping(__vs: Iterable[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping]): ExecutionStatsStore = copy(operatorWorkerMapping = operatorWorkerMapping ++ __vs) + def withOperatorWorkerMapping(__v: _root_.scala.Seq[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping]): ExecutionStatsStore = copy(operatorWorkerMapping = __v) def getFieldByNumber(__fieldNumber: _root_.scala.Int): _root_.scala.Any = { (__fieldNumber: @_root_.scala.unchecked) match { case 1 => { @@ -94,7 +94,7 @@ final case class ExecutionStatsStore( val __t = endTimeStamp if (__t != 0L) __t else null } - case 3 => operatorInfo.iterator.map(edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore._typemapper_operatorInfo.toBase(_)).toSeq + case 3 => operatorInfo.iterator.map(edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore._typemapper_operatorInfo.toBase(_)).toSeq case 4 => operatorWorkerMapping } } @@ -103,22 +103,22 @@ final case class ExecutionStatsStore( (__field.number: @_root_.scala.unchecked) match { case 1 => _root_.scalapb.descriptors.PLong(startTimeStamp) case 2 => _root_.scalapb.descriptors.PLong(endTimeStamp) - case 3 => _root_.scalapb.descriptors.PRepeated(operatorInfo.iterator.map(edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore._typemapper_operatorInfo.toBase(_).toPMessage).toVector) + case 3 => _root_.scalapb.descriptors.PRepeated(operatorInfo.iterator.map(edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore._typemapper_operatorInfo.toBase(_).toPMessage).toVector) case 4 => _root_.scalapb.descriptors.PRepeated(operatorWorkerMapping.iterator.map(_.toPMessage).toVector) } } def toProtoString: _root_.scala.Predef.String = _root_.scalapb.TextFormat.printToSingleLineUnicodeString(this) - def companion = edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore - // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.texera.web.ExecutionStatsStore]) + def companion = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore + // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.amber.engine.common.ExecutionStatsStore]) } -object ExecutionStatsStore extends scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore] { - implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore] = this - def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore = { +object ExecutionStatsStore extends scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore] { + implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore] = this + def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore = { var __startTimeStamp: _root_.scala.Long = 0L var __endTimeStamp: _root_.scala.Long = 0L - val __operatorInfo: _root_.scala.collection.mutable.Builder[(_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics), _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics]] = _root_.scala.collection.immutable.Map.newBuilder[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics] - val __operatorWorkerMapping: _root_.scala.collection.immutable.VectorBuilder[edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping] = new _root_.scala.collection.immutable.VectorBuilder[edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping] + val __operatorInfo: _root_.scala.collection.mutable.Builder[(_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics), _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics]] = _root_.scala.collection.immutable.Map.newBuilder[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics] + val __operatorWorkerMapping: _root_.scala.collection.immutable.VectorBuilder[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping] = new _root_.scala.collection.immutable.VectorBuilder[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping] var _done__ = false while (!_done__) { val _tag__ = _input__.readTag() @@ -129,27 +129,27 @@ object ExecutionStatsStore extends scalapb.GeneratedMessageCompanion[edu.uci.ics case 16 => __endTimeStamp = _input__.readInt64() case 26 => - __operatorInfo += edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore._typemapper_operatorInfo.toCustom(_root_.scalapb.LiteParser.readMessage[edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry](_input__)) + __operatorInfo += edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore._typemapper_operatorInfo.toCustom(_root_.scalapb.LiteParser.readMessage[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry](_input__)) case 34 => - __operatorWorkerMapping += _root_.scalapb.LiteParser.readMessage[edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping](_input__) + __operatorWorkerMapping += _root_.scalapb.LiteParser.readMessage[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping](_input__) case tag => _input__.skipField(tag) } } - edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore( + edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore( startTimeStamp = __startTimeStamp, endTimeStamp = __endTimeStamp, operatorInfo = __operatorInfo.result(), operatorWorkerMapping = __operatorWorkerMapping.result() ) } - implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore] = _root_.scalapb.descriptors.Reads{ + implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage eq scalaDescriptor), "FieldDescriptor does not match message type.") - edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore( + edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore( startTimeStamp = __fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).map(_.as[_root_.scala.Long]).getOrElse(0L), endTimeStamp = __fieldsMap.get(scalaDescriptor.findFieldByNumber(2).get).map(_.as[_root_.scala.Long]).getOrElse(0L), - operatorInfo = __fieldsMap.get(scalaDescriptor.findFieldByNumber(3).get).map(_.as[_root_.scala.Seq[edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry]]).getOrElse(_root_.scala.Seq.empty).iterator.map(edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore._typemapper_operatorInfo.toCustom(_)).toMap, - operatorWorkerMapping = __fieldsMap.get(scalaDescriptor.findFieldByNumber(4).get).map(_.as[_root_.scala.Seq[edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping]]).getOrElse(_root_.scala.Seq.empty) + operatorInfo = __fieldsMap.get(scalaDescriptor.findFieldByNumber(3).get).map(_.as[_root_.scala.Seq[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry]]).getOrElse(_root_.scala.Seq.empty).iterator.map(edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore._typemapper_operatorInfo.toCustom(_)).toMap, + operatorWorkerMapping = __fieldsMap.get(scalaDescriptor.findFieldByNumber(4).get).map(_.as[_root_.scala.Seq[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping]]).getOrElse(_root_.scala.Seq.empty) ) case _ => throw new RuntimeException("Expected PMessage") } @@ -158,17 +158,17 @@ object ExecutionStatsStore extends scalapb.GeneratedMessageCompanion[edu.uci.ics def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null (__number: @_root_.scala.unchecked) match { - case 3 => __out = edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry - case 4 => __out = edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping + case 3 => __out = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry + case 4 => __out = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping } __out } lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( - _root_.edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry + _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry ) def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) - lazy val defaultInstance = edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore( + lazy val defaultInstance = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore( startTimeStamp = 0L, endTimeStamp = 0L, operatorInfo = _root_.scala.collection.immutable.Map.empty, @@ -177,7 +177,7 @@ object ExecutionStatsStore extends scalapb.GeneratedMessageCompanion[edu.uci.ics @SerialVersionUID(0L) final case class OperatorInfoEntry( key: _root_.scala.Predef.String = "", - value: _root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics] = _root_.scala.None + value: _root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics] = _root_.scala.None ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[OperatorInfoEntry] { @transient private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0 @@ -219,9 +219,9 @@ object ExecutionStatsStore extends scalapb.GeneratedMessageCompanion[edu.uci.ics }; } def withKey(__v: _root_.scala.Predef.String): OperatorInfoEntry = copy(key = __v) - def getValue: edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics = value.getOrElse(edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics.defaultInstance) + def getValue: edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics = value.getOrElse(edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics.defaultInstance) def clearValue: OperatorInfoEntry = copy(value = _root_.scala.None) - def withValue(__v: edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics): OperatorInfoEntry = copy(value = Option(__v)) + def withValue(__v: edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics): OperatorInfoEntry = copy(value = Option(__v)) def getFieldByNumber(__fieldNumber: _root_.scala.Int): _root_.scala.Any = { (__fieldNumber: @_root_.scala.unchecked) match { case 1 => { @@ -239,15 +239,15 @@ object ExecutionStatsStore extends scalapb.GeneratedMessageCompanion[edu.uci.ics } } def toProtoString: _root_.scala.Predef.String = _root_.scalapb.TextFormat.printToSingleLineUnicodeString(this) - def companion = edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry - // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.texera.web.ExecutionStatsStore.OperatorInfoEntry]) + def companion = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry + // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.amber.engine.common.ExecutionStatsStore.OperatorInfoEntry]) } - object OperatorInfoEntry extends scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry] { - implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry] = this - def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry = { + object OperatorInfoEntry extends scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry] { + implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry] = this + def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry = { var __key: _root_.scala.Predef.String = "" - var __value: _root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics] = _root_.scala.None + var __value: _root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics] = _root_.scala.None var _done__ = false while (!_done__) { val _tag__ = _input__.readTag() @@ -256,81 +256,81 @@ object ExecutionStatsStore extends scalapb.GeneratedMessageCompanion[edu.uci.ics case 10 => __key = _input__.readStringRequireUtf8() case 18 => - __value = Option(__value.fold(_root_.scalapb.LiteParser.readMessage[edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _))) + __value = Option(__value.fold(_root_.scalapb.LiteParser.readMessage[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _))) case tag => _input__.skipField(tag) } } - edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry( + edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry( key = __key, value = __value ) } - implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry] = _root_.scalapb.descriptors.Reads{ + implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage eq scalaDescriptor), "FieldDescriptor does not match message type.") - edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry( + edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry( key = __fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).map(_.as[_root_.scala.Predef.String]).getOrElse(""), - value = __fieldsMap.get(scalaDescriptor.findFieldByNumber(2).get).flatMap(_.as[_root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics]]) + value = __fieldsMap.get(scalaDescriptor.findFieldByNumber(2).get).flatMap(_.as[_root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics]]) ) case _ => throw new RuntimeException("Expected PMessage") } - def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore.javaDescriptor.getNestedTypes().get(0) - def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore.scalaDescriptor.nestedMessages(0) + def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore.javaDescriptor.getNestedTypes().get(0) + def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore.scalaDescriptor.nestedMessages(0) def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null (__number: @_root_.scala.unchecked) match { - case 2 => __out = edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics + case 2 => __out = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics } __out } lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) - lazy val defaultInstance = edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry( + lazy val defaultInstance = edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry( key = "", value = _root_.scala.None ) - implicit class OperatorInfoEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry](_l) { + implicit class OperatorInfoEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) - def value: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics] = field(_.getValue)((c_, f_) => c_.copy(value = Option(f_))) - def optionalValue: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics]] = field(_.value)((c_, f_) => c_.copy(value = f_)) + def value: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics] = field(_.getValue)((c_, f_) => c_.copy(value = Option(f_))) + def optionalValue: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics]] = field(_.value)((c_, f_) => c_.copy(value = f_)) } final val KEY_FIELD_NUMBER = 1 final val VALUE_FIELD_NUMBER = 2 @transient - implicit val keyValueMapper: _root_.scalapb.TypeMapper[edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry, (_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics)] = - _root_.scalapb.TypeMapper[edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry, (_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics)](__m => (__m.key, __m.getValue))(__p => edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry(__p._1, Some(__p._2))) + implicit val keyValueMapper: _root_.scalapb.TypeMapper[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry, (_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics)] = + _root_.scalapb.TypeMapper[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry, (_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics)](__m => (__m.key, __m.getValue))(__p => edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry(__p._1, Some(__p._2))) def of( key: _root_.scala.Predef.String, - value: _root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics] - ): _root_.edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry = _root_.edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry( + value: _root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics] + ): _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry = _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry( key, value ) - // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.texera.web.ExecutionStatsStore.OperatorInfoEntry]) + // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.ExecutionStatsStore.OperatorInfoEntry]) } - implicit class ExecutionStatsStoreLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore](_l) { + implicit class ExecutionStatsStoreLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore](_l) { def startTimeStamp: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Long] = field(_.startTimeStamp)((c_, f_) => c_.copy(startTimeStamp = f_)) def endTimeStamp: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Long] = field(_.endTimeStamp)((c_, f_) => c_.copy(endTimeStamp = f_)) - def operatorInfo: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics]] = field(_.operatorInfo)((c_, f_) => c_.copy(operatorInfo = f_)) - def operatorWorkerMapping: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping]] = field(_.operatorWorkerMapping)((c_, f_) => c_.copy(operatorWorkerMapping = f_)) + def operatorInfo: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics]] = field(_.operatorInfo)((c_, f_) => c_.copy(operatorInfo = f_)) + def operatorWorkerMapping: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping]] = field(_.operatorWorkerMapping)((c_, f_) => c_.copy(operatorWorkerMapping = f_)) } final val STARTTIMESTAMP_FIELD_NUMBER = 1 final val ENDTIMESTAMP_FIELD_NUMBER = 2 final val OPERATOR_INFO_FIELD_NUMBER = 3 final val OPERATOR_WORKER_MAPPING_FIELD_NUMBER = 4 @transient - private[workflowruntimestate] val _typemapper_operatorInfo: _root_.scalapb.TypeMapper[edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry, (_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics)] = implicitly[_root_.scalapb.TypeMapper[edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry, (_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics)]] + private[workflowruntimestate] val _typemapper_operatorInfo: _root_.scalapb.TypeMapper[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry, (_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics)] = implicitly[_root_.scalapb.TypeMapper[edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore.OperatorInfoEntry, (_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics)]] def of( startTimeStamp: _root_.scala.Long, endTimeStamp: _root_.scala.Long, - operatorInfo: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics], - operatorWorkerMapping: _root_.scala.Seq[edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping] - ): _root_.edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore = _root_.edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore( + operatorInfo: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics], + operatorWorkerMapping: _root_.scala.Seq[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping] + ): _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore = _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore( startTimeStamp, endTimeStamp, operatorInfo, operatorWorkerMapping ) - // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.texera.web.ExecutionStatsStore]) + // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.ExecutionStatsStore]) } diff --git a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/FatalErrorType.scala b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/FatalErrorType.scala similarity index 81% rename from core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/FatalErrorType.scala rename to core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/FatalErrorType.scala index 728d3e16301..5470ffb9857 100644 --- a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/FatalErrorType.scala +++ b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/FatalErrorType.scala @@ -3,14 +3,14 @@ // // Protofile syntax: PROTO3 -package edu.uci.ics.texera.web.workflowruntimestate +package edu.uci.ics.amber.engine.common.workflowruntimestate sealed abstract class FatalErrorType(val value: _root_.scala.Int) extends _root_.scalapb.GeneratedEnum { type EnumType = FatalErrorType def isCompilationError: _root_.scala.Boolean = false def isExecutionFailure: _root_.scala.Boolean = false - def companion: _root_.scalapb.GeneratedEnumCompanion[FatalErrorType] = edu.uci.ics.texera.web.workflowruntimestate.FatalErrorType - final def asRecognized: _root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.FatalErrorType.Recognized] = if (isUnrecognized) _root_.scala.None else _root_.scala.Some(this.asInstanceOf[edu.uci.ics.texera.web.workflowruntimestate.FatalErrorType.Recognized]) + def companion: _root_.scalapb.GeneratedEnumCompanion[FatalErrorType] = edu.uci.ics.amber.engine.common.workflowruntimestate.FatalErrorType + final def asRecognized: _root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.FatalErrorType.Recognized] = if (isUnrecognized) _root_.scala.None else _root_.scala.Some(this.asInstanceOf[edu.uci.ics.amber.engine.common.workflowruntimestate.FatalErrorType.Recognized]) } object FatalErrorType extends _root_.scalapb.GeneratedEnumCompanion[FatalErrorType] { diff --git a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/OperatorBreakpoints.scala b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/OperatorBreakpoints.scala similarity index 61% rename from core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/OperatorBreakpoints.scala rename to core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/OperatorBreakpoints.scala index e6906ae083b..35d1c32ac85 100644 --- a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/OperatorBreakpoints.scala +++ b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/OperatorBreakpoints.scala @@ -3,11 +3,11 @@ // // Protofile syntax: PROTO3 -package edu.uci.ics.texera.web.workflowruntimestate +package edu.uci.ics.amber.engine.common.workflowruntimestate @SerialVersionUID(0L) final case class OperatorBreakpoints( - unresolvedBreakpoints: _root_.scala.Seq[edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault] = _root_.scala.Seq.empty + unresolvedBreakpoints: _root_.scala.Seq[edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault] = _root_.scala.Seq.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[OperatorBreakpoints] { @transient private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0 @@ -36,9 +36,9 @@ final case class OperatorBreakpoints( }; } def clearUnresolvedBreakpoints = copy(unresolvedBreakpoints = _root_.scala.Seq.empty) - def addUnresolvedBreakpoints(__vs: edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault*): OperatorBreakpoints = addAllUnresolvedBreakpoints(__vs) - def addAllUnresolvedBreakpoints(__vs: Iterable[edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault]): OperatorBreakpoints = copy(unresolvedBreakpoints = unresolvedBreakpoints ++ __vs) - def withUnresolvedBreakpoints(__v: _root_.scala.Seq[edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault]): OperatorBreakpoints = copy(unresolvedBreakpoints = __v) + def addUnresolvedBreakpoints(__vs: edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault*): OperatorBreakpoints = addAllUnresolvedBreakpoints(__vs) + def addAllUnresolvedBreakpoints(__vs: Iterable[edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault]): OperatorBreakpoints = copy(unresolvedBreakpoints = unresolvedBreakpoints ++ __vs) + def withUnresolvedBreakpoints(__v: _root_.scala.Seq[edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault]): OperatorBreakpoints = copy(unresolvedBreakpoints = __v) def getFieldByNumber(__fieldNumber: _root_.scala.Int): _root_.scala.Any = { (__fieldNumber: @_root_.scala.unchecked) match { case 1 => unresolvedBreakpoints @@ -51,33 +51,33 @@ final case class OperatorBreakpoints( } } def toProtoString: _root_.scala.Predef.String = _root_.scalapb.TextFormat.printToSingleLineUnicodeString(this) - def companion = edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints - // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.texera.web.OperatorBreakpoints]) + def companion = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints + // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.amber.engine.common.OperatorBreakpoints]) } -object OperatorBreakpoints extends scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints] { - implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints] = this - def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints = { - val __unresolvedBreakpoints: _root_.scala.collection.immutable.VectorBuilder[edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault] = new _root_.scala.collection.immutable.VectorBuilder[edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault] +object OperatorBreakpoints extends scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints] { + implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints] = this + def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints = { + val __unresolvedBreakpoints: _root_.scala.collection.immutable.VectorBuilder[edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault] = new _root_.scala.collection.immutable.VectorBuilder[edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault] var _done__ = false while (!_done__) { val _tag__ = _input__.readTag() _tag__ match { case 0 => _done__ = true case 10 => - __unresolvedBreakpoints += _root_.scalapb.LiteParser.readMessage[edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault](_input__) + __unresolvedBreakpoints += _root_.scalapb.LiteParser.readMessage[edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault](_input__) case tag => _input__.skipField(tag) } } - edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints( + edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints( unresolvedBreakpoints = __unresolvedBreakpoints.result() ) } - implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints] = _root_.scalapb.descriptors.Reads{ + implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage eq scalaDescriptor), "FieldDescriptor does not match message type.") - edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints( - unresolvedBreakpoints = __fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).map(_.as[_root_.scala.Seq[edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault]]).getOrElse(_root_.scala.Seq.empty) + edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints( + unresolvedBreakpoints = __fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).map(_.as[_root_.scala.Seq[edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault]]).getOrElse(_root_.scala.Seq.empty) ) case _ => throw new RuntimeException("Expected PMessage") } @@ -86,23 +86,23 @@ object OperatorBreakpoints extends scalapb.GeneratedMessageCompanion[edu.uci.ics def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null (__number: @_root_.scala.unchecked) match { - case 1 => __out = edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault + case 1 => __out = edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault } __out } lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) - lazy val defaultInstance = edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints( + lazy val defaultInstance = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints( unresolvedBreakpoints = _root_.scala.Seq.empty ) - implicit class OperatorBreakpointsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints](_l) { - def unresolvedBreakpoints: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault]] = field(_.unresolvedBreakpoints)((c_, f_) => c_.copy(unresolvedBreakpoints = f_)) + implicit class OperatorBreakpointsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints](_l) { + def unresolvedBreakpoints: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault]] = field(_.unresolvedBreakpoints)((c_, f_) => c_.copy(unresolvedBreakpoints = f_)) } final val UNRESOLVED_BREAKPOINTS_FIELD_NUMBER = 1 def of( - unresolvedBreakpoints: _root_.scala.Seq[edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault] - ): _root_.edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints = _root_.edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints( + unresolvedBreakpoints: _root_.scala.Seq[edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault] + ): _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints = _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints( unresolvedBreakpoints ) - // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.texera.web.OperatorBreakpoints]) + // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.OperatorBreakpoints]) } diff --git a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/OperatorConsole.scala b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/OperatorConsole.scala similarity index 60% rename from core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/OperatorConsole.scala rename to core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/OperatorConsole.scala index 46d33cdeb31..fd87777a374 100644 --- a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/OperatorConsole.scala +++ b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/OperatorConsole.scala @@ -3,12 +3,12 @@ // // Protofile syntax: PROTO3 -package edu.uci.ics.texera.web.workflowruntimestate +package edu.uci.ics.amber.engine.common.workflowruntimestate @SerialVersionUID(0L) final case class OperatorConsole( consoleMessages: _root_.scala.Seq[edu.uci.ics.amber.engine.architecture.worker.controlcommands.ConsoleMessage] = _root_.scala.Seq.empty, - evaluateExprResults: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList] = _root_.scala.collection.immutable.Map.empty + evaluateExprResults: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList] = _root_.scala.collection.immutable.Map.empty ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[OperatorConsole] { @transient private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0 @@ -19,7 +19,7 @@ final case class OperatorConsole( __size += 1 + _root_.com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize } evaluateExprResults.foreach { __item => - val __value = edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole._typemapper_evaluateExprResults.toBase(__item) + val __value = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole._typemapper_evaluateExprResults.toBase(__item) __size += 1 + _root_.com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize } __size @@ -40,7 +40,7 @@ final case class OperatorConsole( __m.writeTo(_output__) }; evaluateExprResults.foreach { __v => - val __m = edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole._typemapper_evaluateExprResults.toBase(__v) + val __m = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole._typemapper_evaluateExprResults.toBase(__v) _output__.writeTag(2, 2) _output__.writeUInt32NoTag(__m.serializedSize) __m.writeTo(_output__) @@ -51,32 +51,32 @@ final case class OperatorConsole( def addAllConsoleMessages(__vs: Iterable[edu.uci.ics.amber.engine.architecture.worker.controlcommands.ConsoleMessage]): OperatorConsole = copy(consoleMessages = consoleMessages ++ __vs) def withConsoleMessages(__v: _root_.scala.Seq[edu.uci.ics.amber.engine.architecture.worker.controlcommands.ConsoleMessage]): OperatorConsole = copy(consoleMessages = __v) def clearEvaluateExprResults = copy(evaluateExprResults = _root_.scala.collection.immutable.Map.empty) - def addEvaluateExprResults(__vs: (_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList)*): OperatorConsole = addAllEvaluateExprResults(__vs) - def addAllEvaluateExprResults(__vs: Iterable[(_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList)]): OperatorConsole = copy(evaluateExprResults = evaluateExprResults ++ __vs) - def withEvaluateExprResults(__v: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList]): OperatorConsole = copy(evaluateExprResults = __v) + def addEvaluateExprResults(__vs: (_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList)*): OperatorConsole = addAllEvaluateExprResults(__vs) + def addAllEvaluateExprResults(__vs: Iterable[(_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList)]): OperatorConsole = copy(evaluateExprResults = evaluateExprResults ++ __vs) + def withEvaluateExprResults(__v: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList]): OperatorConsole = copy(evaluateExprResults = __v) def getFieldByNumber(__fieldNumber: _root_.scala.Int): _root_.scala.Any = { (__fieldNumber: @_root_.scala.unchecked) match { case 1 => consoleMessages - case 2 => evaluateExprResults.iterator.map(edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole._typemapper_evaluateExprResults.toBase(_)).toSeq + case 2 => evaluateExprResults.iterator.map(edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole._typemapper_evaluateExprResults.toBase(_)).toSeq } } def getField(__field: _root_.scalapb.descriptors.FieldDescriptor): _root_.scalapb.descriptors.PValue = { _root_.scala.Predef.require(__field.containingMessage eq companion.scalaDescriptor) (__field.number: @_root_.scala.unchecked) match { case 1 => _root_.scalapb.descriptors.PRepeated(consoleMessages.iterator.map(_.toPMessage).toVector) - case 2 => _root_.scalapb.descriptors.PRepeated(evaluateExprResults.iterator.map(edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole._typemapper_evaluateExprResults.toBase(_).toPMessage).toVector) + case 2 => _root_.scalapb.descriptors.PRepeated(evaluateExprResults.iterator.map(edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole._typemapper_evaluateExprResults.toBase(_).toPMessage).toVector) } } def toProtoString: _root_.scala.Predef.String = _root_.scalapb.TextFormat.printToSingleLineUnicodeString(this) - def companion = edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole - // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.texera.web.OperatorConsole]) + def companion = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole + // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.amber.engine.common.OperatorConsole]) } -object OperatorConsole extends scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole] { - implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole] = this - def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole = { +object OperatorConsole extends scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole] { + implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole] = this + def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole = { val __consoleMessages: _root_.scala.collection.immutable.VectorBuilder[edu.uci.ics.amber.engine.architecture.worker.controlcommands.ConsoleMessage] = new _root_.scala.collection.immutable.VectorBuilder[edu.uci.ics.amber.engine.architecture.worker.controlcommands.ConsoleMessage] - val __evaluateExprResults: _root_.scala.collection.mutable.Builder[(_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList), _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList]] = _root_.scala.collection.immutable.Map.newBuilder[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList] + val __evaluateExprResults: _root_.scala.collection.mutable.Builder[(_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList), _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList]] = _root_.scala.collection.immutable.Map.newBuilder[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList] var _done__ = false while (!_done__) { val _tag__ = _input__.readTag() @@ -85,21 +85,21 @@ object OperatorConsole extends scalapb.GeneratedMessageCompanion[edu.uci.ics.tex case 10 => __consoleMessages += _root_.scalapb.LiteParser.readMessage[edu.uci.ics.amber.engine.architecture.worker.controlcommands.ConsoleMessage](_input__) case 18 => - __evaluateExprResults += edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole._typemapper_evaluateExprResults.toCustom(_root_.scalapb.LiteParser.readMessage[edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry](_input__)) + __evaluateExprResults += edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole._typemapper_evaluateExprResults.toCustom(_root_.scalapb.LiteParser.readMessage[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry](_input__)) case tag => _input__.skipField(tag) } } - edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole( + edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole( consoleMessages = __consoleMessages.result(), evaluateExprResults = __evaluateExprResults.result() ) } - implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole] = _root_.scalapb.descriptors.Reads{ + implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage eq scalaDescriptor), "FieldDescriptor does not match message type.") - edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole( + edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole( consoleMessages = __fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).map(_.as[_root_.scala.Seq[edu.uci.ics.amber.engine.architecture.worker.controlcommands.ConsoleMessage]]).getOrElse(_root_.scala.Seq.empty), - evaluateExprResults = __fieldsMap.get(scalaDescriptor.findFieldByNumber(2).get).map(_.as[_root_.scala.Seq[edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry]]).getOrElse(_root_.scala.Seq.empty).iterator.map(edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole._typemapper_evaluateExprResults.toCustom(_)).toMap + evaluateExprResults = __fieldsMap.get(scalaDescriptor.findFieldByNumber(2).get).map(_.as[_root_.scala.Seq[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry]]).getOrElse(_root_.scala.Seq.empty).iterator.map(edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole._typemapper_evaluateExprResults.toCustom(_)).toMap ) case _ => throw new RuntimeException("Expected PMessage") } @@ -109,23 +109,23 @@ object OperatorConsole extends scalapb.GeneratedMessageCompanion[edu.uci.ics.tex var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null (__number: @_root_.scala.unchecked) match { case 1 => __out = edu.uci.ics.amber.engine.architecture.worker.controlcommands.ConsoleMessage - case 2 => __out = edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry + case 2 => __out = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry } __out } lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( - _root_.edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry + _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry ) def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) - lazy val defaultInstance = edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole( + lazy val defaultInstance = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole( consoleMessages = _root_.scala.Seq.empty, evaluateExprResults = _root_.scala.collection.immutable.Map.empty ) @SerialVersionUID(0L) final case class EvaluateExprResultsEntry( key: _root_.scala.Predef.String = "", - value: _root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList] = _root_.scala.None + value: _root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList] = _root_.scala.None ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[EvaluateExprResultsEntry] { @transient private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0 @@ -167,9 +167,9 @@ object OperatorConsole extends scalapb.GeneratedMessageCompanion[edu.uci.ics.tex }; } def withKey(__v: _root_.scala.Predef.String): EvaluateExprResultsEntry = copy(key = __v) - def getValue: edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList = value.getOrElse(edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList.defaultInstance) + def getValue: edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList = value.getOrElse(edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList.defaultInstance) def clearValue: EvaluateExprResultsEntry = copy(value = _root_.scala.None) - def withValue(__v: edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList): EvaluateExprResultsEntry = copy(value = Option(__v)) + def withValue(__v: edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList): EvaluateExprResultsEntry = copy(value = Option(__v)) def getFieldByNumber(__fieldNumber: _root_.scala.Int): _root_.scala.Any = { (__fieldNumber: @_root_.scala.unchecked) match { case 1 => { @@ -187,15 +187,15 @@ object OperatorConsole extends scalapb.GeneratedMessageCompanion[edu.uci.ics.tex } } def toProtoString: _root_.scala.Predef.String = _root_.scalapb.TextFormat.printToSingleLineUnicodeString(this) - def companion = edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry - // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.texera.web.OperatorConsole.EvaluateExprResultsEntry]) + def companion = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry + // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.amber.engine.common.OperatorConsole.EvaluateExprResultsEntry]) } - object EvaluateExprResultsEntry extends scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry] { - implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry] = this - def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry = { + object EvaluateExprResultsEntry extends scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry] { + implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry] = this + def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry = { var __key: _root_.scala.Predef.String = "" - var __value: _root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList] = _root_.scala.None + var __value: _root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList] = _root_.scala.None var _done__ = false while (!_done__) { val _tag__ = _input__.readTag() @@ -204,73 +204,73 @@ object OperatorConsole extends scalapb.GeneratedMessageCompanion[edu.uci.ics.tex case 10 => __key = _input__.readStringRequireUtf8() case 18 => - __value = Option(__value.fold(_root_.scalapb.LiteParser.readMessage[edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _))) + __value = Option(__value.fold(_root_.scalapb.LiteParser.readMessage[edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _))) case tag => _input__.skipField(tag) } } - edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry( + edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry( key = __key, value = __value ) } - implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry] = _root_.scalapb.descriptors.Reads{ + implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage eq scalaDescriptor), "FieldDescriptor does not match message type.") - edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry( + edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry( key = __fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).map(_.as[_root_.scala.Predef.String]).getOrElse(""), - value = __fieldsMap.get(scalaDescriptor.findFieldByNumber(2).get).flatMap(_.as[_root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList]]) + value = __fieldsMap.get(scalaDescriptor.findFieldByNumber(2).get).flatMap(_.as[_root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList]]) ) case _ => throw new RuntimeException("Expected PMessage") } - def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.javaDescriptor.getNestedTypes().get(0) - def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.scalaDescriptor.nestedMessages(0) + def javaDescriptor: _root_.com.google.protobuf.Descriptors.Descriptor = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.javaDescriptor.getNestedTypes().get(0) + def scalaDescriptor: _root_.scalapb.descriptors.Descriptor = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.scalaDescriptor.nestedMessages(0) def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null (__number: @_root_.scala.unchecked) match { - case 2 => __out = edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList + case 2 => __out = edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList } __out } lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) - lazy val defaultInstance = edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry( + lazy val defaultInstance = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry( key = "", value = _root_.scala.None ) - implicit class EvaluateExprResultsEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry](_l) { + implicit class EvaluateExprResultsEntryLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry](_l) { def key: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.key)((c_, f_) => c_.copy(key = f_)) - def value: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList] = field(_.getValue)((c_, f_) => c_.copy(value = Option(f_))) - def optionalValue: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList]] = field(_.value)((c_, f_) => c_.copy(value = f_)) + def value: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList] = field(_.getValue)((c_, f_) => c_.copy(value = Option(f_))) + def optionalValue: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList]] = field(_.value)((c_, f_) => c_.copy(value = f_)) } final val KEY_FIELD_NUMBER = 1 final val VALUE_FIELD_NUMBER = 2 @transient - implicit val keyValueMapper: _root_.scalapb.TypeMapper[edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry, (_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList)] = - _root_.scalapb.TypeMapper[edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry, (_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList)](__m => (__m.key, __m.getValue))(__p => edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry(__p._1, Some(__p._2))) + implicit val keyValueMapper: _root_.scalapb.TypeMapper[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry, (_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList)] = + _root_.scalapb.TypeMapper[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry, (_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList)](__m => (__m.key, __m.getValue))(__p => edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry(__p._1, Some(__p._2))) def of( key: _root_.scala.Predef.String, - value: _root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList] - ): _root_.edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry = _root_.edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry( + value: _root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList] + ): _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry = _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry( key, value ) - // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.texera.web.OperatorConsole.EvaluateExprResultsEntry]) + // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.OperatorConsole.EvaluateExprResultsEntry]) } - implicit class OperatorConsoleLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole](_l) { + implicit class OperatorConsoleLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole](_l) { def consoleMessages: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[edu.uci.ics.amber.engine.architecture.worker.controlcommands.ConsoleMessage]] = field(_.consoleMessages)((c_, f_) => c_.copy(consoleMessages = f_)) - def evaluateExprResults: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList]] = field(_.evaluateExprResults)((c_, f_) => c_.copy(evaluateExprResults = f_)) + def evaluateExprResults: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList]] = field(_.evaluateExprResults)((c_, f_) => c_.copy(evaluateExprResults = f_)) } final val CONSOLE_MESSAGES_FIELD_NUMBER = 1 final val EVALUATE_EXPR_RESULTS_FIELD_NUMBER = 2 @transient - private[workflowruntimestate] val _typemapper_evaluateExprResults: _root_.scalapb.TypeMapper[edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry, (_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList)] = implicitly[_root_.scalapb.TypeMapper[edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry, (_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList)]] + private[workflowruntimestate] val _typemapper_evaluateExprResults: _root_.scalapb.TypeMapper[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry, (_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList)] = implicitly[_root_.scalapb.TypeMapper[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole.EvaluateExprResultsEntry, (_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList)]] def of( consoleMessages: _root_.scala.Seq[edu.uci.ics.amber.engine.architecture.worker.controlcommands.ConsoleMessage], - evaluateExprResults: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList] - ): _root_.edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole = _root_.edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole( + evaluateExprResults: _root_.scala.collection.immutable.Map[_root_.scala.Predef.String, edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList] + ): _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole = _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole( consoleMessages, evaluateExprResults ) - // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.texera.web.OperatorConsole]) + // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.OperatorConsole]) } diff --git a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/OperatorMetrics.scala b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/OperatorMetrics.scala similarity index 50% rename from core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/OperatorMetrics.scala rename to core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/OperatorMetrics.scala index cc863e3c700..32e8c2317df 100644 --- a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/OperatorMetrics.scala +++ b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/OperatorMetrics.scala @@ -3,12 +3,12 @@ // // Protofile syntax: PROTO3 -package edu.uci.ics.texera.web.workflowruntimestate +package edu.uci.ics.amber.engine.common.workflowruntimestate @SerialVersionUID(0L) final case class OperatorMetrics( - operatorState: edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState = edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.UNINITIALIZED, - operatorStatistics: edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics = edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics.defaultInstance + operatorState: edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState = edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.UNINITIALIZED, + operatorStatistics: edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics.defaultInstance ) extends scalapb.GeneratedMessage with scalapb.lenses.Updatable[OperatorMetrics] { @transient private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0 @@ -24,7 +24,7 @@ final case class OperatorMetrics( { val __value = operatorStatistics - if (__value != edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics.defaultInstance) { + if (__value != edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics.defaultInstance) { __size += 1 + _root_.com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize } }; @@ -47,15 +47,15 @@ final case class OperatorMetrics( }; { val __v = operatorStatistics - if (__v != edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics.defaultInstance) { + if (__v != edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics.defaultInstance) { _output__.writeTag(2, 2) _output__.writeUInt32NoTag(__v.serializedSize) __v.writeTo(_output__) } }; } - def withOperatorState(__v: edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState): OperatorMetrics = copy(operatorState = __v) - def withOperatorStatistics(__v: edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics): OperatorMetrics = copy(operatorStatistics = __v) + def withOperatorState(__v: edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState): OperatorMetrics = copy(operatorState = __v) + def withOperatorStatistics(__v: edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics): OperatorMetrics = copy(operatorStatistics = __v) def getFieldByNumber(__fieldNumber: _root_.scala.Int): _root_.scala.Any = { (__fieldNumber: @_root_.scala.unchecked) match { case 1 => { @@ -64,7 +64,7 @@ final case class OperatorMetrics( } case 2 => { val __t = operatorStatistics - if (__t != edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics.defaultInstance) __t else null + if (__t != edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics.defaultInstance) __t else null } } } @@ -76,38 +76,38 @@ final case class OperatorMetrics( } } def toProtoString: _root_.scala.Predef.String = _root_.scalapb.TextFormat.printToSingleLineUnicodeString(this) - def companion = edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics - // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.texera.web.OperatorMetrics]) + def companion = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics + // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.amber.engine.common.OperatorMetrics]) } -object OperatorMetrics extends scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics] { - implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics] = this - def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics = { - var __operatorState: edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState = edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.UNINITIALIZED - var __operatorStatistics: _root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics] = _root_.scala.None +object OperatorMetrics extends scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics] { + implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics] = this + def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics = { + var __operatorState: edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState = edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.UNINITIALIZED + var __operatorStatistics: _root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics] = _root_.scala.None var _done__ = false while (!_done__) { val _tag__ = _input__.readTag() _tag__ match { case 0 => _done__ = true case 8 => - __operatorState = edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.fromValue(_input__.readEnum()) + __operatorState = edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.fromValue(_input__.readEnum()) case 18 => - __operatorStatistics = _root_.scala.Some(__operatorStatistics.fold(_root_.scalapb.LiteParser.readMessage[edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _))) + __operatorStatistics = _root_.scala.Some(__operatorStatistics.fold(_root_.scalapb.LiteParser.readMessage[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _))) case tag => _input__.skipField(tag) } } - edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics( + edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics( operatorState = __operatorState, - operatorStatistics = __operatorStatistics.getOrElse(edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics.defaultInstance) + operatorStatistics = __operatorStatistics.getOrElse(edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics.defaultInstance) ) } - implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics] = _root_.scalapb.descriptors.Reads{ + implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage eq scalaDescriptor), "FieldDescriptor does not match message type.") - edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics( - operatorState = edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.fromValue(__fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).map(_.as[_root_.scalapb.descriptors.EnumValueDescriptor]).getOrElse(edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.UNINITIALIZED.scalaValueDescriptor).number), - operatorStatistics = __fieldsMap.get(scalaDescriptor.findFieldByNumber(2).get).map(_.as[edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics]).getOrElse(edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics.defaultInstance) + edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics( + operatorState = edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.fromValue(__fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).map(_.as[_root_.scalapb.descriptors.EnumValueDescriptor]).getOrElse(edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.UNINITIALIZED.scalaValueDescriptor).number), + operatorStatistics = __fieldsMap.get(scalaDescriptor.findFieldByNumber(2).get).map(_.as[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics]).getOrElse(edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics.defaultInstance) ) case _ => throw new RuntimeException("Expected PMessage") } @@ -116,32 +116,32 @@ object OperatorMetrics extends scalapb.GeneratedMessageCompanion[edu.uci.ics.tex def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = { var __out: _root_.scalapb.GeneratedMessageCompanion[_] = null (__number: @_root_.scala.unchecked) match { - case 2 => __out = edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics + case 2 => __out = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics } __out } lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = { (__fieldNumber: @_root_.scala.unchecked) match { - case 1 => edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState + case 1 => edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState } } - lazy val defaultInstance = edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics( - operatorState = edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.UNINITIALIZED, - operatorStatistics = edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics.defaultInstance + lazy val defaultInstance = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics( + operatorState = edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.UNINITIALIZED, + operatorStatistics = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics.defaultInstance ) - implicit class OperatorMetricsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics](_l) { - def operatorState: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState] = field(_.operatorState)((c_, f_) => c_.copy(operatorState = f_)) - def operatorStatistics: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics] = field(_.operatorStatistics)((c_, f_) => c_.copy(operatorStatistics = f_)) + implicit class OperatorMetricsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics](_l) { + def operatorState: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState] = field(_.operatorState)((c_, f_) => c_.copy(operatorState = f_)) + def operatorStatistics: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics] = field(_.operatorStatistics)((c_, f_) => c_.copy(operatorStatistics = f_)) } final val OPERATOR_STATE_FIELD_NUMBER = 1 final val OPERATOR_STATISTICS_FIELD_NUMBER = 2 def of( - operatorState: edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState, - operatorStatistics: edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics - ): _root_.edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics = _root_.edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics( + operatorState: edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState, + operatorStatistics: edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics + ): _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics = _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics( operatorState, operatorStatistics ) - // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.texera.web.OperatorMetrics]) + // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.OperatorMetrics]) } diff --git a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/OperatorStatistics.scala b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/OperatorStatistics.scala similarity index 90% rename from core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/OperatorStatistics.scala rename to core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/OperatorStatistics.scala index caffd03d386..ac9916e52b0 100644 --- a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/OperatorStatistics.scala +++ b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/OperatorStatistics.scala @@ -3,7 +3,7 @@ // // Protofile syntax: PROTO3 -package edu.uci.ics.texera.web.workflowruntimestate +package edu.uci.ics.amber.engine.common.workflowruntimestate @SerialVersionUID(0L) final case class OperatorStatistics( @@ -148,13 +148,13 @@ final case class OperatorStatistics( } } def toProtoString: _root_.scala.Predef.String = _root_.scalapb.TextFormat.printToSingleLineUnicodeString(this) - def companion = edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics - // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.texera.web.OperatorStatistics]) + def companion = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics + // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.amber.engine.common.OperatorStatistics]) } -object OperatorStatistics extends scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics] { - implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics] = this - def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics = { +object OperatorStatistics extends scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics] { + implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics] = this + def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics = { val __inputCount: _root_.scala.collection.immutable.VectorBuilder[edu.uci.ics.amber.engine.architecture.worker.statistics.PortTupleCountMapping] = new _root_.scala.collection.immutable.VectorBuilder[edu.uci.ics.amber.engine.architecture.worker.statistics.PortTupleCountMapping] val __outputCount: _root_.scala.collection.immutable.VectorBuilder[edu.uci.ics.amber.engine.architecture.worker.statistics.PortTupleCountMapping] = new _root_.scala.collection.immutable.VectorBuilder[edu.uci.ics.amber.engine.architecture.worker.statistics.PortTupleCountMapping] var __numWorkers: _root_.scala.Int = 0 @@ -181,7 +181,7 @@ object OperatorStatistics extends scalapb.GeneratedMessageCompanion[edu.uci.ics. case tag => _input__.skipField(tag) } } - edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics( + edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics( inputCount = __inputCount.result(), outputCount = __outputCount.result(), numWorkers = __numWorkers, @@ -190,10 +190,10 @@ object OperatorStatistics extends scalapb.GeneratedMessageCompanion[edu.uci.ics. idleTime = __idleTime ) } - implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics] = _root_.scalapb.descriptors.Reads{ + implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage eq scalaDescriptor), "FieldDescriptor does not match message type.") - edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics( + edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics( inputCount = __fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).map(_.as[_root_.scala.Seq[edu.uci.ics.amber.engine.architecture.worker.statistics.PortTupleCountMapping]]).getOrElse(_root_.scala.Seq.empty), outputCount = __fieldsMap.get(scalaDescriptor.findFieldByNumber(2).get).map(_.as[_root_.scala.Seq[edu.uci.ics.amber.engine.architecture.worker.statistics.PortTupleCountMapping]]).getOrElse(_root_.scala.Seq.empty), numWorkers = __fieldsMap.get(scalaDescriptor.findFieldByNumber(3).get).map(_.as[_root_.scala.Int]).getOrElse(0), @@ -215,7 +215,7 @@ object OperatorStatistics extends scalapb.GeneratedMessageCompanion[edu.uci.ics. } lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) - lazy val defaultInstance = edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics( + lazy val defaultInstance = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics( inputCount = _root_.scala.Seq.empty, outputCount = _root_.scala.Seq.empty, numWorkers = 0, @@ -223,7 +223,7 @@ object OperatorStatistics extends scalapb.GeneratedMessageCompanion[edu.uci.ics. controlProcessingTime = 0L, idleTime = 0L ) - implicit class OperatorStatisticsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics](_l) { + implicit class OperatorStatisticsLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics](_l) { def inputCount: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[edu.uci.ics.amber.engine.architecture.worker.statistics.PortTupleCountMapping]] = field(_.inputCount)((c_, f_) => c_.copy(inputCount = f_)) def outputCount: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[edu.uci.ics.amber.engine.architecture.worker.statistics.PortTupleCountMapping]] = field(_.outputCount)((c_, f_) => c_.copy(outputCount = f_)) def numWorkers: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Int] = field(_.numWorkers)((c_, f_) => c_.copy(numWorkers = f_)) @@ -244,7 +244,7 @@ object OperatorStatistics extends scalapb.GeneratedMessageCompanion[edu.uci.ics. dataProcessingTime: _root_.scala.Long, controlProcessingTime: _root_.scala.Long, idleTime: _root_.scala.Long - ): _root_.edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics = _root_.edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics( + ): _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics = _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics( inputCount, outputCount, numWorkers, @@ -252,5 +252,5 @@ object OperatorStatistics extends scalapb.GeneratedMessageCompanion[edu.uci.ics. controlProcessingTime, idleTime ) - // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.texera.web.OperatorStatistics]) + // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.OperatorStatistics]) } diff --git a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/OperatorWorkerMapping.scala b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/OperatorWorkerMapping.scala similarity index 81% rename from core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/OperatorWorkerMapping.scala rename to core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/OperatorWorkerMapping.scala index efe2ee8d72c..3b4c7076147 100644 --- a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/OperatorWorkerMapping.scala +++ b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/OperatorWorkerMapping.scala @@ -3,7 +3,7 @@ // // Protofile syntax: PROTO3 -package edu.uci.ics.texera.web.workflowruntimestate +package edu.uci.ics.amber.engine.common.workflowruntimestate @SerialVersionUID(0L) final case class OperatorWorkerMapping( @@ -69,13 +69,13 @@ final case class OperatorWorkerMapping( } } def toProtoString: _root_.scala.Predef.String = _root_.scalapb.TextFormat.printToSingleLineUnicodeString(this) - def companion = edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping - // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.texera.web.OperatorWorkerMapping]) + def companion = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping + // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.amber.engine.common.OperatorWorkerMapping]) } -object OperatorWorkerMapping extends scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping] { - implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping] = this - def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping = { +object OperatorWorkerMapping extends scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping] { + implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping] = this + def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping = { var __operatorId: _root_.scala.Predef.String = "" val __workerIds: _root_.scala.collection.immutable.VectorBuilder[_root_.scala.Predef.String] = new _root_.scala.collection.immutable.VectorBuilder[_root_.scala.Predef.String] var _done__ = false @@ -90,15 +90,15 @@ object OperatorWorkerMapping extends scalapb.GeneratedMessageCompanion[edu.uci.i case tag => _input__.skipField(tag) } } - edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping( + edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping( operatorId = __operatorId, workerIds = __workerIds.result() ) } - implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping] = _root_.scalapb.descriptors.Reads{ + implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage eq scalaDescriptor), "FieldDescriptor does not match message type.") - edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping( + edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping( operatorId = __fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).map(_.as[_root_.scala.Predef.String]).getOrElse(""), workerIds = __fieldsMap.get(scalaDescriptor.findFieldByNumber(2).get).map(_.as[_root_.scala.Seq[_root_.scala.Predef.String]]).getOrElse(_root_.scala.Seq.empty) ) @@ -109,11 +109,11 @@ object OperatorWorkerMapping extends scalapb.GeneratedMessageCompanion[edu.uci.i def messageCompanionForFieldNumber(__number: _root_.scala.Int): _root_.scalapb.GeneratedMessageCompanion[_] = throw new MatchError(__number) lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = throw new MatchError(__fieldNumber) - lazy val defaultInstance = edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping( + lazy val defaultInstance = edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping( operatorId = "", workerIds = _root_.scala.Seq.empty ) - implicit class OperatorWorkerMappingLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping](_l) { + implicit class OperatorWorkerMappingLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping](_l) { def operatorId: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.operatorId)((c_, f_) => c_.copy(operatorId = f_)) def workerIds: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Seq[_root_.scala.Predef.String]] = field(_.workerIds)((c_, f_) => c_.copy(workerIds = f_)) } @@ -122,9 +122,9 @@ object OperatorWorkerMapping extends scalapb.GeneratedMessageCompanion[edu.uci.i def of( operatorId: _root_.scala.Predef.String, workerIds: _root_.scala.Seq[_root_.scala.Predef.String] - ): _root_.edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping = _root_.edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping( + ): _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping = _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping( operatorId, workerIds ) - // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.texera.web.OperatorWorkerMapping]) + // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.OperatorWorkerMapping]) } diff --git a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/WorkflowAggregatedState.scala b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/WorkflowAggregatedState.scala similarity index 90% rename from core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/WorkflowAggregatedState.scala rename to core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/WorkflowAggregatedState.scala index c2765d0182e..acd2f9cfa08 100644 --- a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/WorkflowAggregatedState.scala +++ b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/WorkflowAggregatedState.scala @@ -3,7 +3,7 @@ // // Protofile syntax: PROTO3 -package edu.uci.ics.texera.web.workflowruntimestate +package edu.uci.ics.amber.engine.common.workflowruntimestate sealed abstract class WorkflowAggregatedState(val value: _root_.scala.Int) extends _root_.scalapb.GeneratedEnum { type EnumType = WorkflowAggregatedState @@ -17,8 +17,8 @@ sealed abstract class WorkflowAggregatedState(val value: _root_.scala.Int) exten def isFailed: _root_.scala.Boolean = false def isUnknown: _root_.scala.Boolean = false def isKilled: _root_.scala.Boolean = false - def companion: _root_.scalapb.GeneratedEnumCompanion[WorkflowAggregatedState] = edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState - final def asRecognized: _root_.scala.Option[edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.Recognized] = if (isUnrecognized) _root_.scala.None else _root_.scala.Some(this.asInstanceOf[edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.Recognized]) + def companion: _root_.scalapb.GeneratedEnumCompanion[WorkflowAggregatedState] = edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState + final def asRecognized: _root_.scala.Option[edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.Recognized] = if (isUnrecognized) _root_.scala.None else _root_.scala.Some(this.asInstanceOf[edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.Recognized]) } object WorkflowAggregatedState extends _root_.scalapb.GeneratedEnumCompanion[WorkflowAggregatedState] { diff --git a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/WorkflowFatalError.scala b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/WorkflowFatalError.scala similarity index 79% rename from core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/WorkflowFatalError.scala rename to core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/WorkflowFatalError.scala index 7ea44aafccb..4f840574f76 100644 --- a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/WorkflowFatalError.scala +++ b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/WorkflowFatalError.scala @@ -3,11 +3,11 @@ // // Protofile syntax: PROTO3 -package edu.uci.ics.texera.web.workflowruntimestate +package edu.uci.ics.amber.engine.common.workflowruntimestate @SerialVersionUID(0L) final case class WorkflowFatalError( - `type`: edu.uci.ics.texera.web.workflowruntimestate.FatalErrorType = edu.uci.ics.texera.web.workflowruntimestate.FatalErrorType.COMPILATION_ERROR, + `type`: edu.uci.ics.amber.engine.common.workflowruntimestate.FatalErrorType = edu.uci.ics.amber.engine.common.workflowruntimestate.FatalErrorType.COMPILATION_ERROR, timestamp: com.google.protobuf.timestamp.Timestamp = com.google.protobuf.timestamp.Timestamp.defaultInstance, message: _root_.scala.Predef.String = "", details: _root_.scala.Predef.String = "", @@ -110,7 +110,7 @@ final case class WorkflowFatalError( } }; } - def withType(__v: edu.uci.ics.texera.web.workflowruntimestate.FatalErrorType): WorkflowFatalError = copy(`type` = __v) + def withType(__v: edu.uci.ics.amber.engine.common.workflowruntimestate.FatalErrorType): WorkflowFatalError = copy(`type` = __v) def withTimestamp(__v: com.google.protobuf.timestamp.Timestamp): WorkflowFatalError = copy(timestamp = __v) def withMessage(__v: _root_.scala.Predef.String): WorkflowFatalError = copy(message = __v) def withDetails(__v: _root_.scala.Predef.String): WorkflowFatalError = copy(details = __v) @@ -156,14 +156,14 @@ final case class WorkflowFatalError( } } def toProtoString: _root_.scala.Predef.String = _root_.scalapb.TextFormat.printToSingleLineUnicodeString(this) - def companion = edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError - // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.texera.web.WorkflowFatalError]) + def companion = edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError + // @@protoc_insertion_point(GeneratedMessage[edu.uci.ics.amber.engine.common.WorkflowFatalError]) } -object WorkflowFatalError extends scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError] { - implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError] = this - def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError = { - var __type: edu.uci.ics.texera.web.workflowruntimestate.FatalErrorType = edu.uci.ics.texera.web.workflowruntimestate.FatalErrorType.COMPILATION_ERROR +object WorkflowFatalError extends scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError] { + implicit def messageCompanion: scalapb.GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError] = this + def parseFrom(`_input__`: _root_.com.google.protobuf.CodedInputStream): edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError = { + var __type: edu.uci.ics.amber.engine.common.workflowruntimestate.FatalErrorType = edu.uci.ics.amber.engine.common.workflowruntimestate.FatalErrorType.COMPILATION_ERROR var __timestamp: _root_.scala.Option[com.google.protobuf.timestamp.Timestamp] = _root_.scala.None var __message: _root_.scala.Predef.String = "" var __details: _root_.scala.Predef.String = "" @@ -175,7 +175,7 @@ object WorkflowFatalError extends scalapb.GeneratedMessageCompanion[edu.uci.ics. _tag__ match { case 0 => _done__ = true case 8 => - __type = edu.uci.ics.texera.web.workflowruntimestate.FatalErrorType.fromValue(_input__.readEnum()) + __type = edu.uci.ics.amber.engine.common.workflowruntimestate.FatalErrorType.fromValue(_input__.readEnum()) case 18 => __timestamp = _root_.scala.Some(__timestamp.fold(_root_.scalapb.LiteParser.readMessage[com.google.protobuf.timestamp.Timestamp](_input__))(_root_.scalapb.LiteParser.readMessage(_input__, _))) case 26 => @@ -189,7 +189,7 @@ object WorkflowFatalError extends scalapb.GeneratedMessageCompanion[edu.uci.ics. case tag => _input__.skipField(tag) } } - edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError( + edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError( `type` = __type, timestamp = __timestamp.getOrElse(com.google.protobuf.timestamp.Timestamp.defaultInstance), message = __message, @@ -198,11 +198,11 @@ object WorkflowFatalError extends scalapb.GeneratedMessageCompanion[edu.uci.ics. workerId = __workerId ) } - implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError] = _root_.scalapb.descriptors.Reads{ + implicit def messageReads: _root_.scalapb.descriptors.Reads[edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError] = _root_.scalapb.descriptors.Reads{ case _root_.scalapb.descriptors.PMessage(__fieldsMap) => _root_.scala.Predef.require(__fieldsMap.keys.forall(_.containingMessage eq scalaDescriptor), "FieldDescriptor does not match message type.") - edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError( - `type` = edu.uci.ics.texera.web.workflowruntimestate.FatalErrorType.fromValue(__fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).map(_.as[_root_.scalapb.descriptors.EnumValueDescriptor]).getOrElse(edu.uci.ics.texera.web.workflowruntimestate.FatalErrorType.COMPILATION_ERROR.scalaValueDescriptor).number), + edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError( + `type` = edu.uci.ics.amber.engine.common.workflowruntimestate.FatalErrorType.fromValue(__fieldsMap.get(scalaDescriptor.findFieldByNumber(1).get).map(_.as[_root_.scalapb.descriptors.EnumValueDescriptor]).getOrElse(edu.uci.ics.amber.engine.common.workflowruntimestate.FatalErrorType.COMPILATION_ERROR.scalaValueDescriptor).number), timestamp = __fieldsMap.get(scalaDescriptor.findFieldByNumber(2).get).map(_.as[com.google.protobuf.timestamp.Timestamp]).getOrElse(com.google.protobuf.timestamp.Timestamp.defaultInstance), message = __fieldsMap.get(scalaDescriptor.findFieldByNumber(3).get).map(_.as[_root_.scala.Predef.String]).getOrElse(""), details = __fieldsMap.get(scalaDescriptor.findFieldByNumber(4).get).map(_.as[_root_.scala.Predef.String]).getOrElse(""), @@ -223,19 +223,19 @@ object WorkflowFatalError extends scalapb.GeneratedMessageCompanion[edu.uci.ics. lazy val nestedMessagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = Seq.empty def enumCompanionForFieldNumber(__fieldNumber: _root_.scala.Int): _root_.scalapb.GeneratedEnumCompanion[_] = { (__fieldNumber: @_root_.scala.unchecked) match { - case 1 => edu.uci.ics.texera.web.workflowruntimestate.FatalErrorType + case 1 => edu.uci.ics.amber.engine.common.workflowruntimestate.FatalErrorType } } - lazy val defaultInstance = edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError( - `type` = edu.uci.ics.texera.web.workflowruntimestate.FatalErrorType.COMPILATION_ERROR, + lazy val defaultInstance = edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError( + `type` = edu.uci.ics.amber.engine.common.workflowruntimestate.FatalErrorType.COMPILATION_ERROR, timestamp = com.google.protobuf.timestamp.Timestamp.defaultInstance, message = "", details = "", operatorId = "", workerId = "" ) - implicit class WorkflowFatalErrorLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError](_l) { - def `type`: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.texera.web.workflowruntimestate.FatalErrorType] = field(_.`type`)((c_, f_) => c_.copy(`type` = f_)) + implicit class WorkflowFatalErrorLens[UpperPB](_l: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError]) extends _root_.scalapb.lenses.ObjectLens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError](_l) { + def `type`: _root_.scalapb.lenses.Lens[UpperPB, edu.uci.ics.amber.engine.common.workflowruntimestate.FatalErrorType] = field(_.`type`)((c_, f_) => c_.copy(`type` = f_)) def timestamp: _root_.scalapb.lenses.Lens[UpperPB, com.google.protobuf.timestamp.Timestamp] = field(_.timestamp)((c_, f_) => c_.copy(timestamp = f_)) def message: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.message)((c_, f_) => c_.copy(message = f_)) def details: _root_.scalapb.lenses.Lens[UpperPB, _root_.scala.Predef.String] = field(_.details)((c_, f_) => c_.copy(details = f_)) @@ -249,13 +249,13 @@ object WorkflowFatalError extends scalapb.GeneratedMessageCompanion[edu.uci.ics. final val OPERATORID_FIELD_NUMBER = 5 final val WORKERID_FIELD_NUMBER = 6 def of( - `type`: edu.uci.ics.texera.web.workflowruntimestate.FatalErrorType, + `type`: edu.uci.ics.amber.engine.common.workflowruntimestate.FatalErrorType, timestamp: com.google.protobuf.timestamp.Timestamp, message: _root_.scala.Predef.String, details: _root_.scala.Predef.String, operatorId: _root_.scala.Predef.String, workerId: _root_.scala.Predef.String - ): _root_.edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError = _root_.edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError( + ): _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError = _root_.edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError( `type`, timestamp, message, @@ -263,5 +263,5 @@ object WorkflowFatalError extends scalapb.GeneratedMessageCompanion[edu.uci.ics. operatorId, workerId ) - // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.texera.web.WorkflowFatalError]) + // @@protoc_insertion_point(GeneratedMessageCompanion[edu.uci.ics.amber.engine.common.WorkflowFatalError]) } diff --git a/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/WorkflowruntimestateProto.scala b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/WorkflowruntimestateProto.scala new file mode 100644 index 00000000000..0472dee23ff --- /dev/null +++ b/core/amber/src/main/scalapb/edu/uci/ics/amber/engine/common/workflowruntimestate/WorkflowruntimestateProto.scala @@ -0,0 +1,112 @@ +// Generated by the Scala Plugin for the Protocol Buffer Compiler. +// Do not edit! +// +// Protofile syntax: PROTO3 + +package edu.uci.ics.amber.engine.common.workflowruntimestate + +object WorkflowruntimestateProto extends _root_.scalapb.GeneratedFileObject { + lazy val dependencies: Seq[_root_.scalapb.GeneratedFileObject] = Seq( + edu.uci.ics.amber.engine.architecture.worker.controlcommands.ControlcommandsProto, + edu.uci.ics.amber.engine.architecture.worker.controlreturns.ControlreturnsProto, + edu.uci.ics.amber.engine.architecture.worker.statistics.StatisticsProto, + edu.uci.ics.amber.engine.common.virtualidentity.VirtualidentityProto, + com.google.protobuf.timestamp.TimestampProto, + scalapb.options.ScalapbProto + ) + lazy val messagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = + Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( + edu.uci.ics.amber.engine.common.workflowruntimestate.BreakpointFault, + edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorBreakpoints, + edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionBreakpointStore, + edu.uci.ics.amber.engine.common.workflowruntimestate.EvaluatedValueList, + edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorConsole, + edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionConsoleStore, + edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorWorkerMapping, + edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorStatistics, + edu.uci.ics.amber.engine.common.workflowruntimestate.OperatorMetrics, + edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionStatsStore, + edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError, + edu.uci.ics.amber.engine.common.workflowruntimestate.ExecutionMetadataStore + ) + private lazy val ProtoBytes: _root_.scala.Array[Byte] = + scalapb.Encoding.fromBase64(scala.collection.immutable.Seq( + """CjplZHUvdWNpL2ljcy9hbWJlci9lbmdpbmUvY29tbW9uL3dvcmtmbG93cnVudGltZXN0YXRlLnByb3RvEh9lZHUudWNpLmljc + y5hbWJlci5lbmdpbmUuY29tbW9uGkJlZHUvdWNpL2ljcy9hbWJlci9lbmdpbmUvYXJjaGl0ZWN0dXJlL3dvcmtlci9jb250cm9sY + 29tbWFuZHMucHJvdG8aQWVkdS91Y2kvaWNzL2FtYmVyL2VuZ2luZS9hcmNoaXRlY3R1cmUvd29ya2VyL2NvbnRyb2xyZXR1cm5zL + nByb3RvGj1lZHUvdWNpL2ljcy9hbWJlci9lbmdpbmUvYXJjaGl0ZWN0dXJlL3dvcmtlci9zdGF0aXN0aWNzLnByb3RvGjVlZHUvd + WNpL2ljcy9hbWJlci9lbmdpbmUvY29tbW9uL3ZpcnR1YWxpZGVudGl0eS5wcm90bxofZ29vZ2xlL3Byb3RvYnVmL3RpbWVzdGFtc + C5wcm90bxoVc2NhbGFwYi9zY2FsYXBiLnByb3RvIrQCCg9CcmVha3BvaW50RmF1bHQSMAoLd29ya2VyX25hbWUYASABKAlCD+I/D + BIKd29ya2VyTmFtZVIKd29ya2VyTmFtZRJ4Cg1mYXVsdGVkX3R1cGxlGAIgASgLMkAuZWR1LnVjaS5pY3MuYW1iZXIuZW5naW5lL + mNvbW1vbi5CcmVha3BvaW50RmF1bHQuQnJlYWtwb2ludFR1cGxlQhHiPw4SDGZhdWx0ZWRUdXBsZVIMZmF1bHRlZFR1cGxlGnUKD + 0JyZWFrcG9pbnRUdXBsZRIXCgJpZBgBIAEoA0IH4j8EEgJpZFICaWQSJwoIaXNfaW5wdXQYAiABKAhCDOI/CRIHaXNJbnB1dFIHa + XNJbnB1dBIgCgV0dXBsZRgDIAMoCUIK4j8HEgV0dXBsZVIFdHVwbGUimwEKE09wZXJhdG9yQnJlYWtwb2ludHMSgwEKFnVucmVzb + 2x2ZWRfYnJlYWtwb2ludHMYASADKAsyMC5lZHUudWNpLmljcy5hbWJlci5lbmdpbmUuY29tbW9uLkJyZWFrcG9pbnRGYXVsdEIa4 + j8XEhV1bnJlc29sdmVkQnJlYWtwb2ludHNSFXVucmVzb2x2ZWRCcmVha3BvaW50cyKuAgoYRXhlY3V0aW9uQnJlYWtwb2ludFN0b + 3JlEoMBCg1vcGVyYXRvcl9pbmZvGAEgAygLMksuZWR1LnVjaS5pY3MuYW1iZXIuZW5naW5lLmNvbW1vbi5FeGVjdXRpb25CcmVha + 3BvaW50U3RvcmUuT3BlcmF0b3JJbmZvRW50cnlCEeI/DhIMb3BlcmF0b3JJbmZvUgxvcGVyYXRvckluZm8aiwEKEU9wZXJhdG9yS + W5mb0VudHJ5EhoKA2tleRgBIAEoCUII4j8FEgNrZXlSA2tleRJWCgV2YWx1ZRgCIAEoCzI0LmVkdS51Y2kuaWNzLmFtYmVyLmVuZ + 2luZS5jb21tb24uT3BlcmF0b3JCcmVha3BvaW50c0IK4j8HEgV2YWx1ZVIFdmFsdWU6AjgBIncKEkV2YWx1YXRlZFZhbHVlTGlzd + BJhCgZ2YWx1ZXMYASADKAsyPC5lZHUudWNpLmljcy5hbWJlci5lbmdpbmUuYXJjaGl0ZWN0dXJlLndvcmtlci5FdmFsdWF0ZWRWY + Wx1ZUIL4j8IEgZ2YWx1ZXNSBnZhbHVlcyK+AwoPT3BlcmF0b3JDb25zb2xlEn0KEGNvbnNvbGVfbWVzc2FnZXMYASADKAsyPC5lZ + HUudWNpLmljcy5hbWJlci5lbmdpbmUuYXJjaGl0ZWN0dXJlLndvcmtlci5Db25zb2xlTWVzc2FnZUIU4j8REg9jb25zb2xlTWVzc + 2FnZXNSD2NvbnNvbGVNZXNzYWdlcxKXAQoVZXZhbHVhdGVfZXhwcl9yZXN1bHRzGAIgAygLMkkuZWR1LnVjaS5pY3MuYW1iZXIuZ + W5naW5lLmNvbW1vbi5PcGVyYXRvckNvbnNvbGUuRXZhbHVhdGVFeHByUmVzdWx0c0VudHJ5QhjiPxUSE2V2YWx1YXRlRXhwclJlc + 3VsdHNSE2V2YWx1YXRlRXhwclJlc3VsdHMakQEKGEV2YWx1YXRlRXhwclJlc3VsdHNFbnRyeRIaCgNrZXkYASABKAlCCOI/BRIDa + 2V5UgNrZXkSVQoFdmFsdWUYAiABKAsyMy5lZHUudWNpLmljcy5hbWJlci5lbmdpbmUuY29tbW9uLkV2YWx1YXRlZFZhbHVlTGlzd + EIK4j8HEgV2YWx1ZVIFdmFsdWU6AjgBIrMCChVFeGVjdXRpb25Db25zb2xlU3RvcmUSjAEKEG9wZXJhdG9yX2NvbnNvbGUYASADK + AsySy5lZHUudWNpLmljcy5hbWJlci5lbmdpbmUuY29tbW9uLkV4ZWN1dGlvbkNvbnNvbGVTdG9yZS5PcGVyYXRvckNvbnNvbGVFb + nRyeUIU4j8REg9vcGVyYXRvckNvbnNvbGVSD29wZXJhdG9yQ29uc29sZRqKAQoUT3BlcmF0b3JDb25zb2xlRW50cnkSGgoDa2V5G + AEgASgJQgjiPwUSA2tleVIDa2V5ElIKBXZhbHVlGAIgASgLMjAuZWR1LnVjaS5pY3MuYW1iZXIuZW5naW5lLmNvbW1vbi5PcGVyY + XRvckNvbnNvbGVCCuI/BxIFdmFsdWVSBXZhbHVlOgI4ASJ2ChVPcGVyYXRvcldvcmtlck1hcHBpbmcSLwoKb3BlcmF0b3JJZBgBI + AEoCUIP4j8MEgpvcGVyYXRvcklkUgpvcGVyYXRvcklkEiwKCXdvcmtlcklkcxgCIAMoCUIO4j8LEgl3b3JrZXJJZHNSCXdvcmtlc + klkcyKCBAoST3BlcmF0b3JTdGF0aXN0aWNzEnUKC2lucHV0X2NvdW50GAEgAygLMkMuZWR1LnVjaS5pY3MuYW1iZXIuZW5naW5lL + mFyY2hpdGVjdHVyZS53b3JrZXIuUG9ydFR1cGxlQ291bnRNYXBwaW5nQg/iPwwSCmlucHV0Q291bnRSCmlucHV0Q291bnQSeAoMb + 3V0cHV0X2NvdW50GAIgAygLMkMuZWR1LnVjaS5pY3MuYW1iZXIuZW5naW5lLmFyY2hpdGVjdHVyZS53b3JrZXIuUG9ydFR1cGxlQ + 291bnRNYXBwaW5nQhDiPw0SC291dHB1dENvdW50UgtvdXRwdXRDb3VudBIwCgtudW1fd29ya2VycxgDIAEoBUIP4j8MEgpudW1Xb + 3JrZXJzUgpudW1Xb3JrZXJzEkkKFGRhdGFfcHJvY2Vzc2luZ190aW1lGAQgASgDQhfiPxQSEmRhdGFQcm9jZXNzaW5nVGltZVISZ + GF0YVByb2Nlc3NpbmdUaW1lElIKF2NvbnRyb2xfcHJvY2Vzc2luZ190aW1lGAUgASgDQhriPxcSFWNvbnRyb2xQcm9jZXNzaW5nV + GltZVIVY29udHJvbFByb2Nlc3NpbmdUaW1lEioKCWlkbGVfdGltZRgGIAEoA0IN4j8KEghpZGxlVGltZVIIaWRsZVRpbWUijAIKD + 09wZXJhdG9yTWV0cmljcxJ2Cg5vcGVyYXRvcl9zdGF0ZRgBIAEoDjI4LmVkdS51Y2kuaWNzLmFtYmVyLmVuZ2luZS5jb21tb24uV + 29ya2Zsb3dBZ2dyZWdhdGVkU3RhdGVCFeI/EhINb3BlcmF0b3JTdGF0ZfABAVINb3BlcmF0b3JTdGF0ZRKAAQoTb3BlcmF0b3Jfc + 3RhdGlzdGljcxgCIAEoCzIzLmVkdS51Y2kuaWNzLmFtYmVyLmVuZ2luZS5jb21tb24uT3BlcmF0b3JTdGF0aXN0aWNzQhriPxcSE + m9wZXJhdG9yU3RhdGlzdGljc/ABAVISb3BlcmF0b3JTdGF0aXN0aWNzIqAEChNFeGVjdXRpb25TdGF0c1N0b3JlEjsKDnN0YXJ0V + GltZVN0YW1wGAEgASgDQhPiPxASDnN0YXJ0VGltZVN0YW1wUg5zdGFydFRpbWVTdGFtcBI1CgxlbmRUaW1lU3RhbXAYAiABKANCE + eI/DhIMZW5kVGltZVN0YW1wUgxlbmRUaW1lU3RhbXASfgoNb3BlcmF0b3JfaW5mbxgDIAMoCzJGLmVkdS51Y2kuaWNzLmFtYmVyL + mVuZ2luZS5jb21tb24uRXhlY3V0aW9uU3RhdHNTdG9yZS5PcGVyYXRvckluZm9FbnRyeUIR4j8OEgxvcGVyYXRvckluZm9SDG9wZ + XJhdG9ySW5mbxKKAQoXb3BlcmF0b3Jfd29ya2VyX21hcHBpbmcYBCADKAsyNi5lZHUudWNpLmljcy5hbWJlci5lbmdpbmUuY29tb + W9uLk9wZXJhdG9yV29ya2VyTWFwcGluZ0Ia4j8XEhVvcGVyYXRvcldvcmtlck1hcHBpbmdSFW9wZXJhdG9yV29ya2VyTWFwcGluZ + xqHAQoRT3BlcmF0b3JJbmZvRW50cnkSGgoDa2V5GAEgASgJQgjiPwUSA2tleVIDa2V5ElIKBXZhbHVlGAIgASgLMjAuZWR1LnVja + S5pY3MuYW1iZXIuZW5naW5lLmNvbW1vbi5PcGVyYXRvck1ldHJpY3NCCuI/BxIFdmFsdWVSBXZhbHVlOgI4ASLdAgoSV29ya2Zsb + 3dGYXRhbEVycm9yEk4KBHR5cGUYASABKA4yLy5lZHUudWNpLmljcy5hbWJlci5lbmdpbmUuY29tbW9uLkZhdGFsRXJyb3JUeXBlQ + gniPwYSBHR5cGVSBHR5cGUSSwoJdGltZXN0YW1wGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEIR4j8OEgl0aW1lc + 3RhbXDwAQFSCXRpbWVzdGFtcBImCgdtZXNzYWdlGAMgASgJQgziPwkSB21lc3NhZ2VSB21lc3NhZ2USJgoHZGV0YWlscxgEIAEoC + UIM4j8JEgdkZXRhaWxzUgdkZXRhaWxzEi8KCm9wZXJhdG9ySWQYBSABKAlCD+I/DBIKb3BlcmF0b3JJZFIKb3BlcmF0b3JJZBIpC + gh3b3JrZXJJZBgGIAEoCUIN4j8KEgh3b3JrZXJJZFIId29ya2VySWQigQMKFkV4ZWN1dGlvbk1ldGFkYXRhU3RvcmUSWgoFc3Rhd + GUYASABKA4yOC5lZHUudWNpLmljcy5hbWJlci5lbmdpbmUuY29tbW9uLldvcmtmbG93QWdncmVnYXRlZFN0YXRlQgriPwcSBXN0Y + XRlUgVzdGF0ZRJoCgxmYXRhbF9lcnJvcnMYAiADKAsyMy5lZHUudWNpLmljcy5hbWJlci5lbmdpbmUuY29tbW9uLldvcmtmbG93R + mF0YWxFcnJvckIQ4j8NEgtmYXRhbEVycm9yc1ILZmF0YWxFcnJvcnMSaQoLZXhlY3V0aW9uSWQYAyABKAsyMi5lZHUudWNpLmljc + y5hbWJlci5lbmdpbmUuY29tbW9uLkV4ZWN1dGlvbklkZW50aXR5QhPiPxASC2V4ZWN1dGlvbklk8AEBUgtleGVjdXRpb25JZBI2C + g1pc19yZWNvdmVyaW5nGAQgASgIQhHiPw4SDGlzUmVjb3ZlcmluZ1IMaXNSZWNvdmVyaW5nKj4KDkZhdGFsRXJyb3JUeXBlEhUKE + UNPTVBJTEFUSU9OX0VSUk9SEAASFQoRRVhFQ1VUSU9OX0ZBSUxVUkUQASqfAQoXV29ya2Zsb3dBZ2dyZWdhdGVkU3RhdGUSEQoNV + U5JTklUSUFMSVpFRBAAEgkKBVJFQURZEAESCwoHUlVOTklORxACEgsKB1BBVVNJTkcQAxIKCgZQQVVTRUQQBBIMCghSRVNVTUlOR + xAFEg0KCUNPTVBMRVRFRBAGEgoKBkZBSUxFRBAHEgsKB1VOS05PV04QCBIKCgZLSUxMRUQQCUIJ4j8GSABYAHgAYgZwcm90bzM=""" + ).mkString) + lazy val scalaDescriptor: _root_.scalapb.descriptors.FileDescriptor = { + val scalaProto = com.google.protobuf.descriptor.FileDescriptorProto.parseFrom(ProtoBytes) + _root_.scalapb.descriptors.FileDescriptor.buildFrom(scalaProto, dependencies.map(_.scalaDescriptor)) + } + lazy val javaDescriptor: com.google.protobuf.Descriptors.FileDescriptor = { + val javaProto = com.google.protobuf.DescriptorProtos.FileDescriptorProto.parseFrom(ProtoBytes) + com.google.protobuf.Descriptors.FileDescriptor.buildFrom(javaProto, _root_.scala.Array( + edu.uci.ics.amber.engine.architecture.worker.controlcommands.ControlcommandsProto.javaDescriptor, + edu.uci.ics.amber.engine.architecture.worker.controlreturns.ControlreturnsProto.javaDescriptor, + edu.uci.ics.amber.engine.architecture.worker.statistics.StatisticsProto.javaDescriptor, + edu.uci.ics.amber.engine.common.virtualidentity.VirtualidentityProto.javaDescriptor, + com.google.protobuf.timestamp.TimestampProto.javaDescriptor, + scalapb.options.ScalapbProto.javaDescriptor + )) + } + @deprecated("Use javaDescriptor instead. In a future version this will refer to scalaDescriptor.", "ScalaPB 0.5.47") + def descriptor: com.google.protobuf.Descriptors.FileDescriptor = javaDescriptor +} \ No newline at end of file diff --git a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/WorkflowruntimestateProto.scala b/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/WorkflowruntimestateProto.scala deleted file mode 100644 index 361acf77888..00000000000 --- a/core/amber/src/main/scalapb/edu/uci/ics/texera/web/workflowruntimestate/WorkflowruntimestateProto.scala +++ /dev/null @@ -1,110 +0,0 @@ -// Generated by the Scala Plugin for the Protocol Buffer Compiler. -// Do not edit! -// -// Protofile syntax: PROTO3 - -package edu.uci.ics.texera.web.workflowruntimestate - -object WorkflowruntimestateProto extends _root_.scalapb.GeneratedFileObject { - lazy val dependencies: Seq[_root_.scalapb.GeneratedFileObject] = Seq( - edu.uci.ics.amber.engine.architecture.worker.controlcommands.ControlcommandsProto, - edu.uci.ics.amber.engine.architecture.worker.controlreturns.ControlreturnsProto, - edu.uci.ics.amber.engine.architecture.worker.statistics.StatisticsProto, - edu.uci.ics.amber.engine.common.virtualidentity.VirtualidentityProto, - com.google.protobuf.timestamp.TimestampProto, - scalapb.options.ScalapbProto - ) - lazy val messagesCompanions: Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]] = - Seq[_root_.scalapb.GeneratedMessageCompanion[_ <: _root_.scalapb.GeneratedMessage]]( - edu.uci.ics.texera.web.workflowruntimestate.BreakpointFault, - edu.uci.ics.texera.web.workflowruntimestate.OperatorBreakpoints, - edu.uci.ics.texera.web.workflowruntimestate.ExecutionBreakpointStore, - edu.uci.ics.texera.web.workflowruntimestate.EvaluatedValueList, - edu.uci.ics.texera.web.workflowruntimestate.OperatorConsole, - edu.uci.ics.texera.web.workflowruntimestate.ExecutionConsoleStore, - edu.uci.ics.texera.web.workflowruntimestate.OperatorWorkerMapping, - edu.uci.ics.texera.web.workflowruntimestate.OperatorStatistics, - edu.uci.ics.texera.web.workflowruntimestate.OperatorMetrics, - edu.uci.ics.texera.web.workflowruntimestate.ExecutionStatsStore, - edu.uci.ics.texera.web.workflowruntimestate.WorkflowFatalError, - edu.uci.ics.texera.web.workflowruntimestate.ExecutionMetadataStore - ) - private lazy val ProtoBytes: _root_.scala.Array[Byte] = - scalapb.Encoding.fromBase64(scala.collection.immutable.Seq( - """Ci1lZHUvdWNpL2ljcy90ZXhlcmEvd29ya2Zsb3dydW50aW1lc3RhdGUucHJvdG8SFmVkdS51Y2kuaWNzLnRleGVyYS53ZWIaQ - mVkdS91Y2kvaWNzL2FtYmVyL2VuZ2luZS9hcmNoaXRlY3R1cmUvd29ya2VyL2NvbnRyb2xjb21tYW5kcy5wcm90bxpBZWR1L3Vja - S9pY3MvYW1iZXIvZW5naW5lL2FyY2hpdGVjdHVyZS93b3JrZXIvY29udHJvbHJldHVybnMucHJvdG8aPWVkdS91Y2kvaWNzL2FtY - mVyL2VuZ2luZS9hcmNoaXRlY3R1cmUvd29ya2VyL3N0YXRpc3RpY3MucHJvdG8aNWVkdS91Y2kvaWNzL2FtYmVyL2VuZ2luZS9jb - 21tb24vdmlydHVhbGlkZW50aXR5LnByb3RvGh9nb29nbGUvcHJvdG9idWYvdGltZXN0YW1wLnByb3RvGhVzY2FsYXBiL3NjYWxhc - GIucHJvdG8iqwIKD0JyZWFrcG9pbnRGYXVsdBIwCgt3b3JrZXJfbmFtZRgBIAEoCUIP4j8MEgp3b3JrZXJOYW1lUgp3b3JrZXJOY - W1lEm8KDWZhdWx0ZWRfdHVwbGUYAiABKAsyNy5lZHUudWNpLmljcy50ZXhlcmEud2ViLkJyZWFrcG9pbnRGYXVsdC5CcmVha3Bva - W50VHVwbGVCEeI/DhIMZmF1bHRlZFR1cGxlUgxmYXVsdGVkVHVwbGUadQoPQnJlYWtwb2ludFR1cGxlEhcKAmlkGAEgASgDQgfiP - wQSAmlkUgJpZBInCghpc19pbnB1dBgCIAEoCEIM4j8JEgdpc0lucHV0Ugdpc0lucHV0EiAKBXR1cGxlGAMgAygJQgriPwcSBXR1c - GxlUgV0dXBsZSKRAQoTT3BlcmF0b3JCcmVha3BvaW50cxJ6ChZ1bnJlc29sdmVkX2JyZWFrcG9pbnRzGAEgAygLMicuZWR1LnVja - S5pY3MudGV4ZXJhLndlYi5CcmVha3BvaW50RmF1bHRCGuI/FxIVdW5yZXNvbHZlZEJyZWFrcG9pbnRzUhV1bnJlc29sdmVkQnJlY - Wtwb2ludHMimwIKGEV4ZWN1dGlvbkJyZWFrcG9pbnRTdG9yZRJ6Cg1vcGVyYXRvcl9pbmZvGAEgAygLMkIuZWR1LnVjaS5pY3Mud - GV4ZXJhLndlYi5FeGVjdXRpb25CcmVha3BvaW50U3RvcmUuT3BlcmF0b3JJbmZvRW50cnlCEeI/DhIMb3BlcmF0b3JJbmZvUgxvc - GVyYXRvckluZm8aggEKEU9wZXJhdG9ySW5mb0VudHJ5EhoKA2tleRgBIAEoCUII4j8FEgNrZXlSA2tleRJNCgV2YWx1ZRgCIAEoC - zIrLmVkdS51Y2kuaWNzLnRleGVyYS53ZWIuT3BlcmF0b3JCcmVha3BvaW50c0IK4j8HEgV2YWx1ZVIFdmFsdWU6AjgBIncKEkV2Y - Wx1YXRlZFZhbHVlTGlzdBJhCgZ2YWx1ZXMYASADKAsyPC5lZHUudWNpLmljcy5hbWJlci5lbmdpbmUuYXJjaGl0ZWN0dXJlLndvc - mtlci5FdmFsdWF0ZWRWYWx1ZUIL4j8IEgZ2YWx1ZXNSBnZhbHVlcyKsAwoPT3BlcmF0b3JDb25zb2xlEn0KEGNvbnNvbGVfbWVzc - 2FnZXMYASADKAsyPC5lZHUudWNpLmljcy5hbWJlci5lbmdpbmUuYXJjaGl0ZWN0dXJlLndvcmtlci5Db25zb2xlTWVzc2FnZUIU4 - j8REg9jb25zb2xlTWVzc2FnZXNSD2NvbnNvbGVNZXNzYWdlcxKOAQoVZXZhbHVhdGVfZXhwcl9yZXN1bHRzGAIgAygLMkAuZWR1L - nVjaS5pY3MudGV4ZXJhLndlYi5PcGVyYXRvckNvbnNvbGUuRXZhbHVhdGVFeHByUmVzdWx0c0VudHJ5QhjiPxUSE2V2YWx1YXRlR - XhwclJlc3VsdHNSE2V2YWx1YXRlRXhwclJlc3VsdHMaiAEKGEV2YWx1YXRlRXhwclJlc3VsdHNFbnRyeRIaCgNrZXkYASABKAlCC - OI/BRIDa2V5UgNrZXkSTAoFdmFsdWUYAiABKAsyKi5lZHUudWNpLmljcy50ZXhlcmEud2ViLkV2YWx1YXRlZFZhbHVlTGlzdEIK4 - j8HEgV2YWx1ZVIFdmFsdWU6AjgBIqECChVFeGVjdXRpb25Db25zb2xlU3RvcmUSgwEKEG9wZXJhdG9yX2NvbnNvbGUYASADKAsyQ - i5lZHUudWNpLmljcy50ZXhlcmEud2ViLkV4ZWN1dGlvbkNvbnNvbGVTdG9yZS5PcGVyYXRvckNvbnNvbGVFbnRyeUIU4j8REg9vc - GVyYXRvckNvbnNvbGVSD29wZXJhdG9yQ29uc29sZRqBAQoUT3BlcmF0b3JDb25zb2xlRW50cnkSGgoDa2V5GAEgASgJQgjiPwUSA - 2tleVIDa2V5EkkKBXZhbHVlGAIgASgLMicuZWR1LnVjaS5pY3MudGV4ZXJhLndlYi5PcGVyYXRvckNvbnNvbGVCCuI/BxIFdmFsd - WVSBXZhbHVlOgI4ASJ2ChVPcGVyYXRvcldvcmtlck1hcHBpbmcSLwoKb3BlcmF0b3JJZBgBIAEoCUIP4j8MEgpvcGVyYXRvcklkU - gpvcGVyYXRvcklkEiwKCXdvcmtlcklkcxgCIAMoCUIO4j8LEgl3b3JrZXJJZHNSCXdvcmtlcklkcyKCBAoST3BlcmF0b3JTdGF0a - XN0aWNzEnUKC2lucHV0X2NvdW50GAEgAygLMkMuZWR1LnVjaS5pY3MuYW1iZXIuZW5naW5lLmFyY2hpdGVjdHVyZS53b3JrZXIuU - G9ydFR1cGxlQ291bnRNYXBwaW5nQg/iPwwSCmlucHV0Q291bnRSCmlucHV0Q291bnQSeAoMb3V0cHV0X2NvdW50GAIgAygLMkMuZ - WR1LnVjaS5pY3MuYW1iZXIuZW5naW5lLmFyY2hpdGVjdHVyZS53b3JrZXIuUG9ydFR1cGxlQ291bnRNYXBwaW5nQhDiPw0SC291d - HB1dENvdW50UgtvdXRwdXRDb3VudBIwCgtudW1fd29ya2VycxgDIAEoBUIP4j8MEgpudW1Xb3JrZXJzUgpudW1Xb3JrZXJzEkkKF - GRhdGFfcHJvY2Vzc2luZ190aW1lGAQgASgDQhfiPxQSEmRhdGFQcm9jZXNzaW5nVGltZVISZGF0YVByb2Nlc3NpbmdUaW1lElIKF - 2NvbnRyb2xfcHJvY2Vzc2luZ190aW1lGAUgASgDQhriPxcSFWNvbnRyb2xQcm9jZXNzaW5nVGltZVIVY29udHJvbFByb2Nlc3Npb - mdUaW1lEioKCWlkbGVfdGltZRgGIAEoA0IN4j8KEghpZGxlVGltZVIIaWRsZVRpbWUi+QEKD09wZXJhdG9yTWV0cmljcxJtCg5vc - GVyYXRvcl9zdGF0ZRgBIAEoDjIvLmVkdS51Y2kuaWNzLnRleGVyYS53ZWIuV29ya2Zsb3dBZ2dyZWdhdGVkU3RhdGVCFeI/EhINb - 3BlcmF0b3JTdGF0ZfABAVINb3BlcmF0b3JTdGF0ZRJ3ChNvcGVyYXRvcl9zdGF0aXN0aWNzGAIgASgLMiouZWR1LnVjaS5pY3Mud - GV4ZXJhLndlYi5PcGVyYXRvclN0YXRpc3RpY3NCGuI/FxISb3BlcmF0b3JTdGF0aXN0aWNz8AEBUhJvcGVyYXRvclN0YXRpc3RpY - 3MihAQKE0V4ZWN1dGlvblN0YXRzU3RvcmUSOwoOc3RhcnRUaW1lU3RhbXAYASABKANCE+I/EBIOc3RhcnRUaW1lU3RhbXBSDnN0Y - XJ0VGltZVN0YW1wEjUKDGVuZFRpbWVTdGFtcBgCIAEoA0IR4j8OEgxlbmRUaW1lU3RhbXBSDGVuZFRpbWVTdGFtcBJ1Cg1vcGVyY - XRvcl9pbmZvGAMgAygLMj0uZWR1LnVjaS5pY3MudGV4ZXJhLndlYi5FeGVjdXRpb25TdGF0c1N0b3JlLk9wZXJhdG9ySW5mb0Vud - HJ5QhHiPw4SDG9wZXJhdG9ySW5mb1IMb3BlcmF0b3JJbmZvEoEBChdvcGVyYXRvcl93b3JrZXJfbWFwcGluZxgEIAMoCzItLmVkd - S51Y2kuaWNzLnRleGVyYS53ZWIuT3BlcmF0b3JXb3JrZXJNYXBwaW5nQhriPxcSFW9wZXJhdG9yV29ya2VyTWFwcGluZ1IVb3Blc - mF0b3JXb3JrZXJNYXBwaW5nGn4KEU9wZXJhdG9ySW5mb0VudHJ5EhoKA2tleRgBIAEoCUII4j8FEgNrZXlSA2tleRJJCgV2YWx1Z - RgCIAEoCzInLmVkdS51Y2kuaWNzLnRleGVyYS53ZWIuT3BlcmF0b3JNZXRyaWNzQgriPwcSBXZhbHVlUgV2YWx1ZToCOAEi1AIKE - ldvcmtmbG93RmF0YWxFcnJvchJFCgR0eXBlGAEgASgOMiYuZWR1LnVjaS5pY3MudGV4ZXJhLndlYi5GYXRhbEVycm9yVHlwZUIJ4 - j8GEgR0eXBlUgR0eXBlEksKCXRpbWVzdGFtcBgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCEeI/DhIJdGltZXN0Y - W1w8AEBUgl0aW1lc3RhbXASJgoHbWVzc2FnZRgDIAEoCUIM4j8JEgdtZXNzYWdlUgdtZXNzYWdlEiYKB2RldGFpbHMYBCABKAlCD - OI/CRIHZGV0YWlsc1IHZGV0YWlscxIvCgpvcGVyYXRvcklkGAUgASgJQg/iPwwSCm9wZXJhdG9ySWRSCm9wZXJhdG9ySWQSKQoId - 29ya2VySWQYBiABKAlCDeI/ChIId29ya2VySWRSCHdvcmtlcklkIu8CChZFeGVjdXRpb25NZXRhZGF0YVN0b3JlElEKBXN0YXRlG - AEgASgOMi8uZWR1LnVjaS5pY3MudGV4ZXJhLndlYi5Xb3JrZmxvd0FnZ3JlZ2F0ZWRTdGF0ZUIK4j8HEgVzdGF0ZVIFc3RhdGUSX - woMZmF0YWxfZXJyb3JzGAIgAygLMiouZWR1LnVjaS5pY3MudGV4ZXJhLndlYi5Xb3JrZmxvd0ZhdGFsRXJyb3JCEOI/DRILZmF0Y - WxFcnJvcnNSC2ZhdGFsRXJyb3JzEmkKC2V4ZWN1dGlvbklkGAMgASgLMjIuZWR1LnVjaS5pY3MuYW1iZXIuZW5naW5lLmNvbW1vb - i5FeGVjdXRpb25JZGVudGl0eUIT4j8QEgtleGVjdXRpb25JZPABAVILZXhlY3V0aW9uSWQSNgoNaXNfcmVjb3ZlcmluZxgEIAEoC - EIR4j8OEgxpc1JlY292ZXJpbmdSDGlzUmVjb3ZlcmluZyo+Cg5GYXRhbEVycm9yVHlwZRIVChFDT01QSUxBVElPTl9FUlJPUhAAE - hUKEUVYRUNVVElPTl9GQUlMVVJFEAEqnwEKF1dvcmtmbG93QWdncmVnYXRlZFN0YXRlEhEKDVVOSU5JVElBTElaRUQQABIJCgVSR - UFEWRABEgsKB1JVTk5JTkcQAhILCgdQQVVTSU5HEAMSCgoGUEFVU0VEEAQSDAoIUkVTVU1JTkcQBRINCglDT01QTEVURUQQBhIKC - gZGQUlMRUQQBxILCgdVTktOT1dOEAgSCgoGS0lMTEVEEAlCCeI/BkgAWAB4AGIGcHJvdG8z""" - ).mkString) - lazy val scalaDescriptor: _root_.scalapb.descriptors.FileDescriptor = { - val scalaProto = com.google.protobuf.descriptor.FileDescriptorProto.parseFrom(ProtoBytes) - _root_.scalapb.descriptors.FileDescriptor.buildFrom(scalaProto, dependencies.map(_.scalaDescriptor)) - } - lazy val javaDescriptor: com.google.protobuf.Descriptors.FileDescriptor = { - val javaProto = com.google.protobuf.DescriptorProtos.FileDescriptorProto.parseFrom(ProtoBytes) - com.google.protobuf.Descriptors.FileDescriptor.buildFrom(javaProto, _root_.scala.Array( - edu.uci.ics.amber.engine.architecture.worker.controlcommands.ControlcommandsProto.javaDescriptor, - edu.uci.ics.amber.engine.architecture.worker.controlreturns.ControlreturnsProto.javaDescriptor, - edu.uci.ics.amber.engine.architecture.worker.statistics.StatisticsProto.javaDescriptor, - edu.uci.ics.amber.engine.common.virtualidentity.VirtualidentityProto.javaDescriptor, - com.google.protobuf.timestamp.TimestampProto.javaDescriptor, - scalapb.options.ScalapbProto.javaDescriptor - )) - } - @deprecated("Use javaDescriptor instead. In a future version this will refer to scalaDescriptor.", "ScalaPB 0.5.47") - def descriptor: com.google.protobuf.Descriptors.FileDescriptor = javaDescriptor -} \ No newline at end of file From 098abc487446d371777f42b85bf3fb5fd7782c45 Mon Sep 17 00:00:00 2001 From: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com> Date: Tue, 8 Oct 2024 16:52:19 -0700 Subject: [PATCH 4/7] fix format --- .../amber/clustering/ClusterListener.scala | 5 +- .../controller/ControllerEvent.scala | 5 +- .../execution/RegionExecution.scala | 5 +- .../execution/WorkflowExecution.scala | 5 +- .../messaginglayer/OutputManager.scala | 8 ++- .../pythonworker/ArrowUtils.scala | 8 ++- .../architecture/worker/DataProcessor.scala | 8 ++- .../engine/common/model/PhysicalPlan.scala | 6 +- .../engine/common/model/WorkflowContext.scala | 6 +- .../model/tuple/AttributeTypeUtils.scala | 6 +- .../ics/texera/web/TexeraWebApplication.scala | 5 +- .../texera/web/WorkflowLifecycleManager.scala | 5 +- .../resource/WorkflowWebsocketResource.scala | 5 +- .../user/dataset/DatasetResource.scala | 68 +++++++++++++++++-- .../web/service/ExecutionConsoleService.scala | 5 +- .../texera/web/service/WorkflowService.scala | 5 +- .../web/storage/ExecutionStateStore.scala | 8 ++- .../workflow/common/operators/LogicalOp.scala | 68 +++++++++++++++++-- .../csv/ParallelCSVScanSourceOpExec.scala | 7 +- .../scan/csvOld/CSVOldScanSourceOpExec.scala | 7 +- .../source/sql/SQLSourceOpExec.scala | 8 ++- .../sql/asterixdb/AsterixDBSourceOpExec.scala | 7 +- .../architecture/worker/WorkerSpec.scala | 8 ++- .../faulttolerance/CheckpointSpec.scala | 6 +- .../workflow/common/tuple/TupleSpec.scala | 8 ++- .../CartesianProductOpExecSpec.scala | 9 ++- .../DictionaryMatcherOpExecSpec.scala | 8 ++- .../difference/DifferenceOpExecSpec.scala | 8 ++- .../distinct/DistinctOpExecSpec.scala | 8 ++- .../download/BulkDownloaderOpExecSpec.scala | 5 +- .../operators/hashJoin/HashJoinOpSpec.scala | 9 ++- .../intersect/IntersectOpExecSpec.scala | 8 ++- .../intervalJoin/IntervalOpExecSpec.scala | 9 ++- .../projection/ProjectionOpExecSpec.scala | 8 ++- .../SortPartitionsOpExecSpec.scala | 8 ++- .../scan/csv/CSVScanSourceOpDescSpec.scala | 5 +- .../SymmetricDifferenceOpExecSpec.scala | 9 ++- .../typecasting/TypeCastingOpExecSpec.scala | 8 ++- .../unneststring/UnnestStringOpExecSpec.scala | 8 ++- .../htmlviz/HtmlVizOpExecSpec.scala | 8 ++- 40 files changed, 335 insertions(+), 65 deletions(-) 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 d86ff9176dd..58ef90c1d6b 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,7 +12,10 @@ import edu.uci.ics.amber.error.ErrorUtils.getStackTraceWithAllCauses 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} -import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.{COMPLETED, FAILED} +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.{ + COMPLETED, + FAILED +} import edu.uci.ics.texera.web.storage.ExecutionStateStore.updateWorkflowState import edu.uci.ics.amber.engine.common.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerEvent.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerEvent.scala index 8cf36af3e49..170405d2816 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerEvent.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/ControllerEvent.scala @@ -3,7 +3,10 @@ package edu.uci.ics.amber.engine.architecture.controller import edu.uci.ics.amber.engine.common.model.tuple.Tuple import edu.uci.ics.amber.engine.common.rpc.AsyncRPCServer.ControlCommand import edu.uci.ics.amber.engine.common.virtualidentity.ActorVirtualIdentity -import edu.uci.ics.amber.engine.common.workflowruntimestate.{OperatorMetrics, WorkflowAggregatedState} +import edu.uci.ics.amber.engine.common.workflowruntimestate.{ + OperatorMetrics, + WorkflowAggregatedState +} object ControllerEvent { 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 34e781e4e67..962dd8f0219 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,7 +5,10 @@ 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.virtualidentity.PhysicalOpIdentity import edu.uci.ics.amber.engine.common.workflow.PhysicalLink -import edu.uci.ics.amber.engine.common.workflowruntimestate.{OperatorMetrics, WorkflowAggregatedState} +import edu.uci.ics.amber.engine.common.workflowruntimestate.{ + OperatorMetrics, + WorkflowAggregatedState +} 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 365dfc6e580..86116b2c8ec 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 @@ -3,7 +3,10 @@ package edu.uci.ics.amber.engine.architecture.controller.execution import edu.uci.ics.amber.engine.architecture.controller.execution.ExecutionUtils.aggregateMetrics import edu.uci.ics.amber.engine.architecture.scheduling.{Region, RegionIdentity} import edu.uci.ics.amber.engine.common.virtualidentity.PhysicalOpIdentity -import edu.uci.ics.amber.engine.common.workflowruntimestate.{OperatorMetrics, WorkflowAggregatedState} +import edu.uci.ics.amber.engine.common.workflowruntimestate.{ + OperatorMetrics, + WorkflowAggregatedState +} import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState._ 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 828bc2de450..503692b4562 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 @@ -9,7 +9,13 @@ 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.engine.common.model.Marker -import edu.uci.ics.amber.engine.common.model.tuple.{FinalizeExecutor, FinalizePort, Schema, SchemaEnforceable, TupleLike} +import edu.uci.ics.amber.engine.common.model.tuple.{ + FinalizeExecutor, + FinalizePort, + Schema, + SchemaEnforceable, + TupleLike +} import edu.uci.ics.amber.engine.common.rpc.AsyncRPCServer.ControlCommand import edu.uci.ics.amber.engine.common.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} import edu.uci.ics.amber.engine.common.workflow.{PhysicalLink, PortIdentity} diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/ArrowUtils.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/ArrowUtils.scala index 49ad1e67657..2ed7e9e5fa5 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/ArrowUtils.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/pythonworker/ArrowUtils.scala @@ -1,7 +1,13 @@ package edu.uci.ics.amber.engine.architecture.pythonworker import com.typesafe.scalalogging.LazyLogging -import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, AttributeTypeUtils, Schema, Tuple} +import edu.uci.ics.amber.engine.common.model.tuple.{ + Attribute, + AttributeType, + AttributeTypeUtils, + Schema, + Tuple +} import AttributeTypeUtils.AttributeTypeException import org.apache.arrow.vector.types.FloatingPointPrecision import org.apache.arrow.vector.types.TimeUnit.MILLISECOND 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 0a49f019478..b7067d0481e 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 @@ -24,7 +24,13 @@ import edu.uci.ics.amber.engine.architecture.worker.statistics.WorkerStatistics import edu.uci.ics.amber.engine.common.ambermessage._ import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.{EndOfInputChannel, StartOfInputChannel, State} -import edu.uci.ics.amber.engine.common.model.tuple.{FinalizeExecutor, FinalizePort, SchemaEnforceable, Tuple, TupleLike} +import edu.uci.ics.amber.engine.common.model.tuple.{ + FinalizeExecutor, + FinalizePort, + SchemaEnforceable, + Tuple, + TupleLike +} import edu.uci.ics.amber.engine.common.statetransition.WorkerStateManager import edu.uci.ics.amber.engine.common.virtualidentity.util.{CONTROLLER, SELF} import edu.uci.ics.amber.engine.common.virtualidentity.{ActorVirtualIdentity, ChannelIdentity} diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/PhysicalPlan.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/PhysicalPlan.scala index fcc9a02425c..66cc00307c1 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/PhysicalPlan.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/PhysicalPlan.scala @@ -4,7 +4,11 @@ import com.fasterxml.jackson.annotation.JsonIgnore import com.typesafe.scalalogging.LazyLogging import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.common.VirtualIdentityUtils -import edu.uci.ics.amber.engine.common.virtualidentity.{ActorVirtualIdentity, OperatorIdentity, PhysicalOpIdentity} +import edu.uci.ics.amber.engine.common.virtualidentity.{ + ActorVirtualIdentity, + OperatorIdentity, + PhysicalOpIdentity +} import edu.uci.ics.amber.engine.common.workflow.PhysicalLink import edu.uci.ics.texera.workflow.common.workflow.{LogicalPlan, PartitionInfo, UnknownPartition} import org.jgrapht.alg.connectivity.BiconnectivityInspector diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/WorkflowContext.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/WorkflowContext.scala index 9f29215c277..d17da014738 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/WorkflowContext.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/WorkflowContext.scala @@ -1,7 +1,11 @@ package edu.uci.ics.amber.engine.common.model import edu.uci.ics.amber.engine.common.AmberConfig -import edu.uci.ics.amber.engine.common.model.WorkflowContext.{DEFAULT_EXECUTION_ID, DEFAULT_WORKFLOW_ID, DEFAULT_WORKFLOW_SETTINGS} +import edu.uci.ics.amber.engine.common.model.WorkflowContext.{ + DEFAULT_EXECUTION_ID, + DEFAULT_WORKFLOW_ID, + DEFAULT_WORKFLOW_SETTINGS +} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.workflow.WorkflowSettings diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/AttributeTypeUtils.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/AttributeTypeUtils.scala index b4f349cb154..60ef1c930a4 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/AttributeTypeUtils.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/AttributeTypeUtils.scala @@ -31,7 +31,9 @@ object AttributeTypeUtils extends Serializable { for (i <- attributes.indices) { if (attributes.apply(i).getName.equals(attribute)) { resultType match { - case AttributeType.STRING | AttributeType.INTEGER | AttributeType.DOUBLE | AttributeType.LONG | AttributeType.BOOLEAN | AttributeType.TIMESTAMP | AttributeType.BINARY => + case AttributeType.STRING | AttributeType.INTEGER | AttributeType.DOUBLE | + AttributeType.LONG | AttributeType.BOOLEAN | AttributeType.TIMESTAMP | + AttributeType.BINARY => builder.add(attribute, resultType) case AttributeType.ANY | _ => builder.add(attribute, attributes.apply(i).getType) @@ -305,7 +307,7 @@ object AttributeTypeUtils extends Serializable { case AttributeType.INTEGER => tryParseInteger(fieldValue) case AttributeType.TIMESTAMP => tryParseTimestamp(fieldValue) case AttributeType.BINARY => tryParseString() - case _ => tryParseString() + case _ => tryParseString() } } diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWebApplication.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWebApplication.scala index 46438ef6703..36b48797bce 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWebApplication.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWebApplication.scala @@ -54,7 +54,10 @@ import edu.uci.ics.texera.web.resource.dashboard.user.workflow.{ import edu.uci.ics.texera.web.resource.languageserver.PythonLanguageServerManager import edu.uci.ics.texera.web.service.ExecutionsMetadataPersistService import edu.uci.ics.texera.web.storage.MongoDatabaseManager -import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.{COMPLETED, FAILED} +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.{ + COMPLETED, + FAILED +} import edu.uci.ics.texera.workflow.common.storage.OpResultStorage import io.dropwizard.auth.{AuthDynamicFeature, AuthValueFactoryProvider} import io.dropwizard.setup.{Bootstrap, Environment} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/WorkflowLifecycleManager.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/WorkflowLifecycleManager.scala index 265f7f5f78d..6207a9d04cc 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/WorkflowLifecycleManager.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/WorkflowLifecycleManager.scala @@ -5,7 +5,10 @@ import akka.actor.Cancellable import com.typesafe.scalalogging.LazyLogging import edu.uci.ics.amber.engine.common.AmberRuntime import edu.uci.ics.texera.web.storage.ExecutionStateStore -import edu.uci.ics.amber.engine.common.workflowruntimestate.{ExecutionMetadataStore, WorkflowAggregatedState} +import edu.uci.ics.amber.engine.common.workflowruntimestate.{ + ExecutionMetadataStore, + WorkflowAggregatedState +} import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.RUNNING import scala.concurrent.duration.DurationInt 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 eb41bee4cb0..f81c0c09379 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 @@ -18,7 +18,10 @@ import edu.uci.ics.texera.web.model.websocket.response._ import edu.uci.ics.texera.web.service.{WorkflowCacheChecker, WorkflowService} import edu.uci.ics.texera.web.storage.ExecutionStateStore import edu.uci.ics.amber.engine.common.workflowruntimestate.FatalErrorType.COMPILATION_ERROR -import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.{PAUSED, RUNNING} +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.{ + PAUSED, + RUNNING +} import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError import edu.uci.ics.texera.web.{ServletAwareConfigurator, SessionState} import edu.uci.ics.texera.workflow.common.workflow.WorkflowCompiler diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/DatasetResource.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/DatasetResource.scala index f8e4c15afca..7015770a3bd 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/DatasetResource.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/DatasetResource.scala @@ -4,15 +4,58 @@ import edu.uci.ics.texera.Utils.withTransaction import edu.uci.ics.texera.web.SqlServer import edu.uci.ics.texera.web.auth.SessionUser import edu.uci.ics.texera.web.model.jooq.generated.enums.DatasetUserAccessPrivilege -import edu.uci.ics.texera.web.model.jooq.generated.tables.daos.{DatasetDao, DatasetUserAccessDao, DatasetVersionDao} -import edu.uci.ics.texera.web.model.jooq.generated.tables.pojos.{Dataset, DatasetUserAccess, DatasetVersion, User} +import edu.uci.ics.texera.web.model.jooq.generated.tables.daos.{ + DatasetDao, + DatasetUserAccessDao, + DatasetVersionDao +} +import edu.uci.ics.texera.web.model.jooq.generated.tables.pojos.{ + Dataset, + DatasetUserAccess, + DatasetVersion, + User +} import edu.uci.ics.texera.web.model.jooq.generated.tables.Dataset.DATASET import edu.uci.ics.texera.web.model.jooq.generated.tables.User.USER import edu.uci.ics.texera.web.model.jooq.generated.tables.DatasetUserAccess.DATASET_USER_ACCESS import edu.uci.ics.texera.web.model.jooq.generated.tables.DatasetVersion.DATASET_VERSION -import edu.uci.ics.texera.web.resource.dashboard.user.dataset.DatasetAccessResource.{getDatasetUserAccessPrivilege, getOwner, userHasReadAccess, userHasWriteAccess, userOwnDataset} -import edu.uci.ics.texera.web.resource.dashboard.user.dataset.DatasetResource.{DATASET_IS_PRIVATE, DATASET_IS_PUBLIC, DashboardDataset, DashboardDatasetVersion, DatasetDescriptionModification, DatasetIDs, DatasetNameModification, DatasetVersionRootFileNodes, DatasetVersions, ERR_DATASET_CREATION_FAILED_MESSAGE, ERR_DATASET_NAME_ALREADY_EXISTS, ERR_USER_HAS_NO_ACCESS_TO_DATASET_MESSAGE, ListDatasetsResponse, context, createNewDatasetVersionFromFormData, getDashboardDataset, getDatasetByID, getDatasetLatestVersion, getDatasetVersionByID, getDatasetVersions, getFileNodesOfCertainVersion, getUserDatasets, resolvePath, retrievePublicDatasets} -import edu.uci.ics.texera.web.resource.dashboard.user.dataset.`type`.{DatasetFileNode, PhysicalFileNode} +import edu.uci.ics.texera.web.resource.dashboard.user.dataset.DatasetAccessResource.{ + getDatasetUserAccessPrivilege, + getOwner, + userHasReadAccess, + userHasWriteAccess, + userOwnDataset +} +import edu.uci.ics.texera.web.resource.dashboard.user.dataset.DatasetResource.{ + DATASET_IS_PRIVATE, + DATASET_IS_PUBLIC, + DashboardDataset, + DashboardDatasetVersion, + DatasetDescriptionModification, + DatasetIDs, + DatasetNameModification, + DatasetVersionRootFileNodes, + DatasetVersions, + ERR_DATASET_CREATION_FAILED_MESSAGE, + ERR_DATASET_NAME_ALREADY_EXISTS, + ERR_USER_HAS_NO_ACCESS_TO_DATASET_MESSAGE, + ListDatasetsResponse, + context, + createNewDatasetVersionFromFormData, + getDashboardDataset, + getDatasetByID, + getDatasetLatestVersion, + getDatasetVersionByID, + getDatasetVersions, + getFileNodesOfCertainVersion, + getUserDatasets, + resolvePath, + retrievePublicDatasets +} +import edu.uci.ics.texera.web.resource.dashboard.user.dataset.`type`.{ + DatasetFileNode, + PhysicalFileNode +} import edu.uci.ics.texera.web.resource.dashboard.user.dataset.service.GitVersionControlLocalFileStorage import edu.uci.ics.texera.web.resource.dashboard.user.dataset.utils.PathUtils import io.dropwizard.auth.Auth @@ -30,14 +73,25 @@ import java.util.zip.{ZipEntry, ZipOutputStream} import java.util import java.util.concurrent.locks.ReentrantLock import javax.annotation.security.RolesAllowed -import javax.ws.rs.{BadRequestException, Consumes, ForbiddenException, GET, NotFoundException, POST, Path, PathParam, Produces, QueryParam, WebApplicationException} +import javax.ws.rs.{ + BadRequestException, + Consumes, + ForbiddenException, + GET, + NotFoundException, + POST, + Path, + PathParam, + Produces, + QueryParam, + WebApplicationException +} import javax.ws.rs.core.{MediaType, Response, StreamingOutput} import scala.collection.convert.ImplicitConversions.`collection AsScalaIterable` import scala.collection.mutable import scala.collection.mutable.ListBuffer import scala.jdk.CollectionConverters.ListHasAsScala - object DatasetResource { val DATASET_IS_PUBLIC: Byte = 1; val DATASET_IS_PRIVATE: Byte = 0; 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 8d11b7be950..c1823f646be 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 @@ -21,7 +21,10 @@ import edu.uci.ics.texera.web.model.websocket.request.python.{ import edu.uci.ics.texera.web.model.websocket.response.python.PythonExpressionEvaluateResponse import edu.uci.ics.texera.web.storage.ExecutionStateStore import edu.uci.ics.texera.web.storage.ExecutionStateStore.updateWorkflowState -import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.{RESUMING, RUNNING} +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.{ + RESUMING, + RUNNING +} import edu.uci.ics.amber.engine.common.workflowruntimestate.{ EvaluatedValueList, ExecutionConsoleStore, 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 1fe344aaed1..f2e16520552 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 @@ -22,7 +22,10 @@ import edu.uci.ics.texera.web.service.WorkflowService.mkWorkflowStateId import edu.uci.ics.texera.web.storage.ExecutionStateStore.updateWorkflowState import edu.uci.ics.texera.web.storage.{ExecutionStateStore, WorkflowStateStore} import edu.uci.ics.amber.engine.common.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE -import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.{COMPLETED, FAILED} +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.{ + COMPLETED, + FAILED +} import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowFatalError import edu.uci.ics.texera.web.{SubscriptionManager, WorkflowLifecycleManager} import edu.uci.ics.texera.workflow.common.storage.OpResultStorage diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/ExecutionStateStore.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/ExecutionStateStore.scala index 41a3e1114b8..e99c462018a 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/ExecutionStateStore.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/ExecutionStateStore.scala @@ -2,7 +2,13 @@ package edu.uci.ics.texera.web.storage import edu.uci.ics.texera.Utils.maptoStatusCode import edu.uci.ics.texera.web.service.ExecutionsMetadataPersistService -import edu.uci.ics.amber.engine.common.workflowruntimestate.{ExecutionBreakpointStore, ExecutionConsoleStore, ExecutionMetadataStore, ExecutionStatsStore, WorkflowAggregatedState} +import edu.uci.ics.amber.engine.common.workflowruntimestate.{ + ExecutionBreakpointStore, + ExecutionConsoleStore, + ExecutionMetadataStore, + ExecutionStatsStore, + WorkflowAggregatedState +} import java.sql.Timestamp diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/LogicalOp.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/LogicalOp.scala index f55c5956d55..e12985e8e29 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/LogicalOp.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/LogicalOp.scala @@ -1,13 +1,23 @@ package edu.uci.ics.texera.workflow.common.operators import com.fasterxml.jackson.annotation.JsonSubTypes.Type -import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty, JsonPropertyDescription, JsonSubTypes, JsonTypeInfo} +import com.fasterxml.jackson.annotation.{ + JsonIgnore, + JsonProperty, + JsonPropertyDescription, + JsonSubTypes, + JsonTypeInfo +} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.common.executor.OperatorExecutor import edu.uci.ics.amber.engine.common.model.{PhysicalPlan, WorkflowContext} import edu.uci.ics.amber.engine.common.model.tuple.Schema -import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, OperatorIdentity, WorkflowIdentity} +import edu.uci.ics.amber.engine.common.virtualidentity.{ + ExecutionIdentity, + OperatorIdentity, + WorkflowIdentity +} import edu.uci.ics.amber.engine.common.workflow.PortIdentity import edu.uci.ics.texera.web.OPversion import edu.uci.ics.texera.workflow.common.metadata.{OperatorInfo, PropertyNameConstants} @@ -24,8 +34,16 @@ import edu.uci.ics.texera.workflow.operators.intersect.IntersectOpDesc import edu.uci.ics.texera.workflow.operators.intervalJoin.IntervalJoinOpDesc import edu.uci.ics.texera.workflow.operators.keywordSearch.KeywordSearchOpDesc import edu.uci.ics.texera.workflow.operators.limit.LimitOpDesc -import edu.uci.ics.texera.workflow.operators.huggingFace.{HuggingFaceIrisLogisticRegressionOpDesc, HuggingFaceSentimentAnalysisOpDesc, HuggingFaceSpamSMSDetectionOpDesc, HuggingFaceTextSummarizationOpDesc} -import edu.uci.ics.texera.workflow.operators.machineLearning.sklearnAdvanced.KNNTrainer.{SklearnAdvancedKNNClassifierTrainerOpDesc, SklearnAdvancedKNNRegressorTrainerOpDesc} +import edu.uci.ics.texera.workflow.operators.huggingFace.{ + HuggingFaceIrisLogisticRegressionOpDesc, + HuggingFaceSentimentAnalysisOpDesc, + HuggingFaceSpamSMSDetectionOpDesc, + HuggingFaceTextSummarizationOpDesc +} +import edu.uci.ics.texera.workflow.operators.machineLearning.sklearnAdvanced.KNNTrainer.{ + SklearnAdvancedKNNClassifierTrainerOpDesc, + SklearnAdvancedKNNRegressorTrainerOpDesc +} import edu.uci.ics.texera.workflow.operators.machineLearning.sklearnAdvanced.SVCTrainer.SklearnAdvancedSVCTrainerOpDesc import edu.uci.ics.texera.workflow.operators.machineLearning.sklearnAdvanced.SVRTrainer.SVCTrainer.SklearnAdvancedSVRTrainerOpDesc import edu.uci.ics.texera.workflow.operators.projection.ProjectionOpDesc @@ -34,11 +52,42 @@ import edu.uci.ics.texera.workflow.operators.regex.RegexOpDesc import edu.uci.ics.texera.workflow.operators.reservoirsampling.ReservoirSamplingOpDesc import edu.uci.ics.texera.workflow.operators.sentiment.SentimentAnalysisOpDesc import edu.uci.ics.texera.workflow.operators.sink.managed.ProgressiveSinkOpDesc -import edu.uci.ics.texera.workflow.operators.sklearn.{SklearnAdaptiveBoostingOpDesc, SklearnBaggingOpDesc, SklearnBernoulliNaiveBayesOpDesc, SklearnComplementNaiveBayesOpDesc, SklearnDecisionTreeOpDesc, SklearnDummyClassifierOpDesc, SklearnExtraTreeOpDesc, SklearnExtraTreesOpDesc, SklearnGaussianNaiveBayesOpDesc, SklearnGradientBoostingOpDesc, SklearnKNNOpDesc, SklearnLinearRegressionOpDesc, SklearnLinearSVMOpDesc, SklearnLogisticRegressionCVOpDesc, SklearnLogisticRegressionOpDesc, SklearnMultiLayerPerceptronOpDesc, SklearnMultinomialNaiveBayesOpDesc, SklearnNearestCentroidOpDesc, SklearnPassiveAggressiveOpDesc, SklearnPerceptronOpDesc, SklearnPredictionOpDesc, SklearnProbabilityCalibrationOpDesc, SklearnRandomForestOpDesc, SklearnRidgeCVOpDesc, SklearnRidgeOpDesc, SklearnSDGOpDesc, SklearnSVMOpDesc} +import edu.uci.ics.texera.workflow.operators.sklearn.{ + SklearnAdaptiveBoostingOpDesc, + SklearnBaggingOpDesc, + SklearnBernoulliNaiveBayesOpDesc, + SklearnComplementNaiveBayesOpDesc, + SklearnDecisionTreeOpDesc, + SklearnDummyClassifierOpDesc, + SklearnExtraTreeOpDesc, + SklearnExtraTreesOpDesc, + SklearnGaussianNaiveBayesOpDesc, + SklearnGradientBoostingOpDesc, + SklearnKNNOpDesc, + SklearnLinearRegressionOpDesc, + SklearnLinearSVMOpDesc, + SklearnLogisticRegressionCVOpDesc, + SklearnLogisticRegressionOpDesc, + SklearnMultiLayerPerceptronOpDesc, + SklearnMultinomialNaiveBayesOpDesc, + SklearnNearestCentroidOpDesc, + SklearnPassiveAggressiveOpDesc, + SklearnPerceptronOpDesc, + SklearnPredictionOpDesc, + SklearnProbabilityCalibrationOpDesc, + SklearnRandomForestOpDesc, + SklearnRidgeCVOpDesc, + SklearnRidgeOpDesc, + SklearnSDGOpDesc, + SklearnSVMOpDesc +} import edu.uci.ics.texera.workflow.operators.sort.SortOpDesc import edu.uci.ics.texera.workflow.operators.sortPartitions.SortPartitionsOpDesc import edu.uci.ics.texera.workflow.operators.source.apis.reddit.RedditSearchSourceOpDesc -import edu.uci.ics.texera.workflow.operators.source.apis.twitter.v2.{TwitterFullArchiveSearchSourceOpDesc, TwitterSearchSourceOpDesc} +import edu.uci.ics.texera.workflow.operators.source.apis.twitter.v2.{ + TwitterFullArchiveSearchSourceOpDesc, + TwitterSearchSourceOpDesc +} import edu.uci.ics.texera.workflow.operators.source.fetcher.URLFetcherOpDesc import edu.uci.ics.texera.workflow.operators.source.scan.FileScanSourceOpDesc import edu.uci.ics.texera.workflow.operators.source.scan.csv.CSVScanSourceOpDesc @@ -53,7 +102,12 @@ import edu.uci.ics.texera.workflow.operators.symmetricDifference.SymmetricDiffer import edu.uci.ics.texera.workflow.operators.typecasting.TypeCastingOpDesc import edu.uci.ics.texera.workflow.operators.udf.java.JavaUDFOpDesc import edu.uci.ics.texera.workflow.operators.udf.python.source.PythonUDFSourceOpDescV2 -import edu.uci.ics.texera.workflow.operators.udf.python.{DualInputPortsPythonUDFOpDescV2, PythonLambdaFunctionOpDesc, PythonTableReducerOpDesc, PythonUDFOpDescV2} +import edu.uci.ics.texera.workflow.operators.udf.python.{ + DualInputPortsPythonUDFOpDescV2, + PythonLambdaFunctionOpDesc, + PythonTableReducerOpDesc, + PythonUDFOpDescV2 +} import edu.uci.ics.texera.workflow.operators.udf.r.{RUDFOpDesc, RUDFSourceOpDesc} import edu.uci.ics.texera.workflow.operators.union.UnionOpDesc import edu.uci.ics.texera.workflow.operators.unneststring.UnnestStringOpDesc diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/ParallelCSVScanSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/ParallelCSVScanSourceOpExec.scala index 3e5dd9dd2a9..a5b130911d8 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/ParallelCSVScanSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/ParallelCSVScanSourceOpExec.scala @@ -1,7 +1,12 @@ package edu.uci.ics.texera.workflow.operators.source.scan.csv import edu.uci.ics.amber.engine.common.executor.SourceOperatorExecutor -import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeTypeUtils, Schema, TupleLike} +import edu.uci.ics.amber.engine.common.model.tuple.{ + Attribute, + AttributeTypeUtils, + Schema, + TupleLike +} import edu.uci.ics.texera.workflow.common.scanner.BufferedBlockReader import org.tukaani.xz.SeekableFileInputStream diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csvOld/CSVOldScanSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csvOld/CSVOldScanSourceOpExec.scala index defc6bb7c3a..60dc8d81d02 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csvOld/CSVOldScanSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csvOld/CSVOldScanSourceOpExec.scala @@ -2,7 +2,12 @@ package edu.uci.ics.texera.workflow.operators.source.scan.csvOld import com.github.tototoshi.csv.{CSVReader, DefaultCSVFormat} import edu.uci.ics.amber.engine.common.executor.SourceOperatorExecutor -import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeTypeUtils, Schema, TupleLike} +import edu.uci.ics.amber.engine.common.model.tuple.{ + Attribute, + AttributeTypeUtils, + Schema, + TupleLike +} import edu.uci.ics.texera.workflow.operators.source.scan.FileDecodingMethod import scala.collection.compat.immutable.ArraySeq diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/SQLSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/SQLSourceOpExec.scala index bb72386aacb..ca9b453f170 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/SQLSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/SQLSourceOpExec.scala @@ -2,7 +2,13 @@ package edu.uci.ics.texera.workflow.operators.source.sql import edu.uci.ics.amber.engine.common.executor.SourceOperatorExecutor import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.{parseField, parseTimestamp} -import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, Tuple, TupleLike} +import edu.uci.ics.amber.engine.common.model.tuple.{ + Attribute, + AttributeType, + Schema, + Tuple, + TupleLike +} import java.sql._ import scala.collection.mutable.ArrayBuffer diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/asterixdb/AsterixDBSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/asterixdb/AsterixDBSourceOpExec.scala index 8f2470a6157..30437c707cf 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/asterixdb/AsterixDBSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/asterixdb/AsterixDBSourceOpExec.scala @@ -298,9 +298,10 @@ class AsterixDBSourceOpExec private[asterixdb] ( attribute.getType ) ) match { - case Success(timestamp: Timestamp) => parseField(timestamp, AttributeType.LONG).asInstanceOf[Number] - case Success(otherTypes) => otherTypes.asInstanceOf[Number] - case Failure(_) => 0 + case Success(timestamp: Timestamp) => + parseField(timestamp, AttributeType.LONG).asInstanceOf[Number] + case Success(otherTypes) => otherTypes.asInstanceOf[Number] + case Failure(_) => 0 } case None => 0 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 2bfdfc7ff33..301c74262e0 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 @@ -18,7 +18,13 @@ import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.AssignPortHa import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.InitializeExecutorHandler.InitializeExecutor import edu.uci.ics.amber.engine.common.ambermessage.{DataFrame, DataPayload, WorkflowFIFOMessage} import edu.uci.ics.amber.engine.common.executor.OperatorExecutor -import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, Tuple, TupleLike} +import edu.uci.ics.amber.engine.common.model.tuple.{ + Attribute, + AttributeType, + Schema, + Tuple, + TupleLike +} import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient.ControlInvocation import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER 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 9e338a80a49..28a03a31920 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 @@ -16,11 +16,7 @@ import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.{ } import edu.uci.ics.amber.engine.architecture.worker.WorkflowWorker.StateRestoreConfig import edu.uci.ics.amber.engine.architecture.worker.DataProcessor -import edu.uci.ics.amber.engine.common.{ - AmberRuntime, - CheckpointState, - CheckpointSupport -} +import edu.uci.ics.amber.engine.common.{AmberRuntime, CheckpointState, CheckpointSupport} import edu.uci.ics.amber.engine.common.SerializedState.{CP_STATE_KEY, DP_STATE_KEY} import edu.uci.ics.amber.engine.common.client.AmberClient import edu.uci.ics.amber.engine.common.executor.{OperatorExecutor, SourceOperatorExecutor} diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/tuple/TupleSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/tuple/TupleSpec.scala index c9ced93667a..074c4edfc4a 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/tuple/TupleSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/tuple/TupleSpec.scala @@ -1,6 +1,12 @@ package edu.uci.ics.texera.workflow.common.tuple -import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, Tuple, TupleBuildingException} +import edu.uci.ics.amber.engine.common.model.tuple.{ + Attribute, + AttributeType, + Schema, + Tuple, + TupleBuildingException +} import edu.uci.ics.amber.engine.common.model.tuple.TupleUtils.{json2tuple, tuple2json} import edu.uci.ics.texera.workflow.common.tuple.exception.TupleBuildingException import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpExecSpec.scala index 84ab9905933..1325c81db1c 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpExecSpec.scala @@ -1,6 +1,13 @@ package edu.uci.ics.texera.workflow.operators.cartesianProduct -import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, SchemaEnforceable, Tuple, TupleLike} +import edu.uci.ics.amber.engine.common.model.tuple.{ + Attribute, + AttributeType, + Schema, + SchemaEnforceable, + Tuple, + TupleLike +} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpExecSpec.scala index d52ab007a77..b51cc6b1538 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpExecSpec.scala @@ -1,6 +1,12 @@ package edu.uci.ics.texera.workflow.operators.dictionary -import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, SchemaEnforceable, Tuple} +import edu.uci.ics.amber.engine.common.model.tuple.{ + Attribute, + AttributeType, + Schema, + SchemaEnforceable, + Tuple +} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpExecSpec.scala index a77ba37b9a5..b52fd165dbb 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpExecSpec.scala @@ -1,6 +1,12 @@ package edu.uci.ics.texera.workflow.operators.difference -import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, Tuple, TupleLike} +import edu.uci.ics.amber.engine.common.model.tuple.{ + Attribute, + AttributeType, + Schema, + Tuple, + TupleLike +} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpExecSpec.scala index 23e0ea7641b..45af6b3ce0d 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpExecSpec.scala @@ -1,6 +1,12 @@ package edu.uci.ics.texera.workflow.operators.distinct -import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, Tuple, TupleLike} +import edu.uci.ics.amber.engine.common.model.tuple.{ + Attribute, + AttributeType, + Schema, + Tuple, + TupleLike +} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec class DistinctOpExecSpec extends AnyFlatSpec with BeforeAndAfter { diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpExecSpec.scala index 3e96b3f4332..20c3e17a98c 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpExecSpec.scala @@ -2,10 +2,7 @@ package edu.uci.ics.texera.workflow.operators.download import edu.uci.ics.amber.engine.common.model.WorkflowContext import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, Tuple} -import WorkflowContext.{ - DEFAULT_EXECUTION_ID, - DEFAULT_WORKFLOW_ID -} +import WorkflowContext.{DEFAULT_EXECUTION_ID, DEFAULT_WORKFLOW_ID} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec class BulkDownloaderOpExecSpec extends AnyFlatSpec with BeforeAndAfter { diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinOpSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinOpSpec.scala index d91fed3c4a0..0f1f52b1a31 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinOpSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinOpSpec.scala @@ -1,6 +1,13 @@ package edu.uci.ics.texera.workflow.operators.hashJoin -import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, SchemaEnforceable, Tuple, TupleLike} +import edu.uci.ics.amber.engine.common.model.tuple.{ + Attribute, + AttributeType, + Schema, + SchemaEnforceable, + Tuple, + TupleLike +} import edu.uci.ics.texera.workflow.operators.hashJoin.HashJoinOpDesc.HASH_JOIN_INTERNAL_KEY_NAME import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpExecSpec.scala index 78858d94fd2..5ee876d2823 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpExecSpec.scala @@ -1,6 +1,12 @@ package edu.uci.ics.texera.workflow.operators.intersect -import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, Tuple, TupleLike} +import edu.uci.ics.amber.engine.common.model.tuple.{ + Attribute, + AttributeType, + Schema, + Tuple, + TupleLike +} import edu.uci.ics.amber.engine.common.virtualidentity.{OperatorIdentity, PhysicalOpIdentity} import edu.uci.ics.amber.engine.common.workflow.{PhysicalLink, PortIdentity} import org.scalatest.BeforeAndAfter diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalOpExecSpec.scala index 13c8d0499a7..afd97287758 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalOpExecSpec.scala @@ -1,6 +1,13 @@ package edu.uci.ics.texera.workflow.operators.intervalJoin -import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, SchemaEnforceable, Tuple, TupleLike} +import edu.uci.ics.amber.engine.common.model.tuple.{ + Attribute, + AttributeType, + Schema, + SchemaEnforceable, + Tuple, + TupleLike +} import edu.uci.ics.amber.engine.common.virtualidentity.{OperatorIdentity, PhysicalOpIdentity} import edu.uci.ics.amber.engine.common.workflow.{PhysicalLink, PortIdentity} import org.scalatest.BeforeAndAfter diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpExecSpec.scala index 1f466b1b244..95623722a5a 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpExecSpec.scala @@ -1,6 +1,12 @@ package edu.uci.ics.texera.workflow.operators.projection -import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, SchemaEnforceable, Tuple} +import edu.uci.ics.amber.engine.common.model.tuple.{ + Attribute, + AttributeType, + Schema, + SchemaEnforceable, + Tuple +} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec class ProjectionOpExecSpec extends AnyFlatSpec with BeforeAndAfter { diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionsOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionsOpExecSpec.scala index 841405ed48f..a67c4cfd1e1 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionsOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionsOpExecSpec.scala @@ -1,6 +1,12 @@ package edu.uci.ics.texera.workflow.operators.sortPartitions -import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, SchemaEnforceable, Tuple} +import edu.uci.ics.amber.engine.common.model.tuple.{ + Attribute, + AttributeType, + Schema, + SchemaEnforceable, + Tuple +} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpDescSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpDescSpec.scala index 1b598279d40..21ce3de60a0 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpDescSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpDescSpec.scala @@ -3,10 +3,7 @@ package edu.uci.ics.texera.workflow.operators.source.scan.csv import edu.uci.ics.amber.engine.common.model.WorkflowContext import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema} import edu.uci.ics.amber.engine.common.workflow.PortIdentity -import WorkflowContext.{ - DEFAULT_EXECUTION_ID, - DEFAULT_WORKFLOW_ID -} +import WorkflowContext.{DEFAULT_EXECUTION_ID, DEFAULT_WORKFLOW_ID} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpExecSpec.scala index c4a7bb1e782..acc5424f3d9 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpExecSpec.scala @@ -1,6 +1,13 @@ package edu.uci.ics.texera.workflow.operators.symmetricDifference -import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, SchemaEnforceable, Tuple, TupleLike} +import edu.uci.ics.amber.engine.common.model.tuple.{ + Attribute, + AttributeType, + Schema, + SchemaEnforceable, + Tuple, + TupleLike +} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpExecSpec.scala index 0fa43160c96..1d857d6f6a3 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpExecSpec.scala @@ -1,6 +1,12 @@ package edu.uci.ics.texera.workflow.operators.typecasting -import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, SchemaEnforceable, Tuple} +import edu.uci.ics.amber.engine.common.model.tuple.{ + Attribute, + AttributeType, + Schema, + SchemaEnforceable, + Tuple +} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/unneststring/UnnestStringOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/unneststring/UnnestStringOpExecSpec.scala index 66f4d02ec74..b812ae9d36a 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/unneststring/UnnestStringOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/unneststring/UnnestStringOpExecSpec.scala @@ -1,6 +1,12 @@ package edu.uci.ics.texera.workflow.operators.unneststring -import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, SchemaEnforceable, Tuple} +import edu.uci.ics.amber.engine.common.model.tuple.{ + Attribute, + AttributeType, + Schema, + SchemaEnforceable, + Tuple +} import edu.uci.ics.amber.engine.common.workflow.PortIdentity import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpExecSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpExecSpec.scala index 22e4ccf4c7e..138d1541cef 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpExecSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpExecSpec.scala @@ -1,6 +1,12 @@ package edu.uci.ics.texera.workflow.operators.visualization.htmlviz -import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema, SchemaEnforceable, Tuple} +import edu.uci.ics.amber.engine.common.model.tuple.{ + Attribute, + AttributeType, + Schema, + SchemaEnforceable, + Tuple +} import org.scalatest.BeforeAndAfter import org.scalatest.flatspec.AnyFlatSpec From b0878aa8b9dd4f3e773df1a01182bda7d6c78982 Mon Sep 17 00:00:00 2001 From: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com> Date: Wed, 9 Oct 2024 10:53:07 -0700 Subject: [PATCH 5/7] move utils and physical layer --- .../promisehandlers/ModifyLogicHandler.scala | 2 +- .../promisehandlers/ReconfigureHandler.scala | 2 +- .../locationpreference/LocationPreference.scala | 2 +- .../pythonworker/PythonWorkflowWorker.scala | 3 +-- .../engine/architecture/scheduling/Region.scala | 2 +- .../scheduling/RegionExecutionCoordinator.scala | 2 +- .../scheduling/RegionPlanGenerator.scala | 3 +-- .../scheduling/config/WorkerConfig.scala | 2 +- .../promisehandlers/UpdateExecutorHandler.scala | 2 +- .../uci/ics/amber/engine/common/AmberConfig.scala | 1 - .../ics/{texera => amber/engine/common}/Utils.scala | 2 +- .../model}/PhysicalOp.scala | 2 +- .../ics/amber/engine/common/model/PhysicalPlan.scala | 1 - .../amber/engine/common/model/WorkflowContext.scala | 1 - .../amber/engine/common/model/WorkflowSettings.scala | 3 +++ .../ics/amber/engine/common/model/tuple/Tuple.scala | 2 +- .../amber/engine/common/model/tuple/TupleUtils.scala | 2 +- .../scala/edu/uci/ics/texera/web/SessionState.scala | 2 +- .../uci/ics/texera/web/TexeraWebApplication.scala | 5 ++--- .../texera/web/TexeraWorkflowCompilingService.scala | 3 +-- .../websocket/request/WorkflowExecuteRequest.scala | 3 ++- .../texera/web/resource/CollaborationResource.scala | 2 +- .../uci/ics/texera/web/resource/GoogleResource.java | 3 ++- .../web/resource/SchemaPropagationResource.scala | 2 +- .../web/resource/WorkflowWebsocketResource.scala | 2 +- .../user/dataset/DatasetAccessResource.scala | 2 +- .../dashboard/user/dataset/DatasetResource.scala | 2 +- .../dashboard/user/dataset/utils/PathUtils.scala | 2 +- .../user/workflow/WorkflowVersionResource.scala | 2 +- .../texera/web/service/ExecutionStatsService.scala | 5 ++--- .../web/service/FriesReconfigurationAlgorithm.scala | 3 +-- .../ics/texera/web/service/ResultExportService.scala | 2 +- .../web/service/WorkflowExecutionService.scala | 2 +- .../web/storage/ExecutionReconfigurationStore.scala | 2 +- .../ics/texera/web/storage/ExecutionStateStore.scala | 2 +- .../edu/uci/ics/texera/web/storage/StateStore.scala | 2 +- .../common/metadata/OperatorMetadataGenerator.scala | 2 +- .../texera/workflow/common/operators/LogicalOp.scala | 3 +-- .../common/operators/PythonOperatorDescriptor.scala | 2 +- .../common/operators/filter/FilterOpDesc.scala | 2 +- .../workflow/common/operators/map/MapOpDesc.scala | 2 +- .../workflow/common/workflow/WorkflowCompiler.scala | 2 +- .../workflow/common/workflow/WorkflowSettings.scala | 12 ------------ .../operators/aggregate/AggregateOpDesc.scala | 3 +-- .../cartesianProduct/CartesianProductOpDesc.scala | 2 +- .../dictionary/DictionaryMatcherOpDesc.scala | 2 +- .../dictionary/DictionaryMatcherOpExec.scala | 2 +- .../operators/difference/DifferenceOpDesc.scala | 2 +- .../workflow/operators/distinct/DistinctOpDesc.scala | 2 +- .../operators/download/BulkDownloaderOpDesc.scala | 2 +- .../operators/filter/SpecializedFilterOpDesc.java | 2 +- .../workflow/operators/hashJoin/HashJoinOpDesc.scala | 3 +-- .../operators/intersect/IntersectOpDesc.scala | 2 +- .../operators/intervalJoin/IntervalJoinOpDesc.scala | 2 +- .../keywordSearch/KeywordSearchOpDesc.scala | 2 +- .../workflow/operators/limit/LimitOpDesc.scala | 2 +- .../operators/projection/ProjectionOpDesc.scala | 4 ++-- .../randomksampling/RandomKSamplingOpDesc.scala | 2 +- .../workflow/operators/regex/RegexOpDesc.scala | 2 +- .../reservoirsampling/ReservoirSamplingOpDesc.scala | 2 +- .../sentiment/SentimentAnalysisOpDesc.scala | 2 +- .../sink/managed/ProgressiveSinkOpDesc.java | 4 ++-- .../sortPartitions/SortPartitionsOpDesc.scala | 2 +- .../v2/TwitterFullArchiveSearchSourceOpDesc.scala | 2 +- .../apis/twitter/v2/TwitterSearchSourceOpDesc.scala | 2 +- .../operators/source/cache/CacheSourceOpDesc.scala | 2 +- .../operators/source/fetcher/URLFetcherOpDesc.scala | 2 +- .../operators/source/scan/FileScanSourceOpDesc.scala | 2 +- .../source/scan/csv/CSVScanSourceOpDesc.scala | 2 +- .../scan/csv/ParallelCSVScanSourceOpDesc.scala | 2 +- .../source/scan/csvOld/CSVOldScanSourceOpDesc.scala | 2 +- .../source/scan/json/JSONLScanSourceOpDesc.scala | 4 ++-- .../source/scan/json/JSONLScanSourceOpExec.scala | 2 +- .../source/scan/text/TextInputSourceOpDesc.scala | 2 +- .../source/sql/asterixdb/AsterixDBSourceOpDesc.scala | 2 +- .../source/sql/mysql/MySQLSourceOpDesc.scala | 2 +- .../sql/postgresql/PostgreSQLSourceOpDesc.scala | 2 +- .../workflow/operators/split/SplitOpDesc.scala | 2 +- .../SymmetricDifferenceOpDesc.scala | 2 +- .../operators/typecasting/TypeCastingOpDesc.java | 4 ++-- .../workflow/operators/udf/java/JavaUDFOpDesc.scala | 2 +- .../udf/python/DualInputPortsPythonUDFOpDescV2.scala | 2 +- .../operators/udf/python/PythonUDFOpDescV2.scala | 2 +- .../udf/python/source/PythonUDFSourceOpDescV2.java | 4 ++-- .../texera/workflow/operators/udf/r/RUDFOpDesc.scala | 2 +- .../workflow/operators/udf/r/RUDFSourceOpDesc.java | 4 ++-- .../workflow/operators/union/UnionOpDesc.scala | 2 +- .../operators/unneststring/UnnestStringOpDesc.scala | 2 +- .../visualization/htmlviz/HtmlVizOpDesc.scala | 2 +- .../visualization/urlviz/UrlVizOpDesc.scala | 2 +- .../scala/edu/uci/ics/texera/web/MockTexeraDB.scala | 2 +- .../common/workflow/SchemaPropagationSpec.scala | 3 +-- 92 files changed, 100 insertions(+), 120 deletions(-) rename core/amber/src/main/scala/edu/uci/ics/{texera => amber/engine/common}/Utils.scala (99%) rename core/amber/src/main/scala/edu/uci/ics/amber/engine/{architecture/deploysemantics => common/model}/PhysicalOp.scala (99%) create mode 100644 core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/WorkflowSettings.scala delete mode 100644 core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/WorkflowSettings.scala diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/ModifyLogicHandler.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/ModifyLogicHandler.scala index e6d1ee712ff..31603ac97e4 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/ModifyLogicHandler.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/ModifyLogicHandler.scala @@ -4,9 +4,9 @@ import com.twitter.util.Future import edu.uci.ics.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer import edu.uci.ics.amber.engine.architecture.controller.promisehandlers.ConsoleMessageHandler.ConsoleMessageTriggered import edu.uci.ics.amber.engine.architecture.controller.promisehandlers.ModifyLogicHandler.ModifyLogic -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.pythonworker.promisehandlers.UpdatePythonExecutorHandler.UpdatePythonExecutor import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.UpdateExecutorHandler.UpdateExecutor +import edu.uci.ics.amber.engine.common.model.PhysicalOp import edu.uci.ics.amber.engine.common.rpc.AsyncRPCServer.ControlCommand import edu.uci.ics.amber.error.ErrorUtils.mkConsoleMessage import edu.uci.ics.texera.workflow.common.operators.StateTransferFunc diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/ReconfigureHandler.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/ReconfigureHandler.scala index 4fc86195463..d907e4947c4 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/ReconfigureHandler.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/controller/promisehandlers/ReconfigureHandler.scala @@ -2,7 +2,7 @@ package edu.uci.ics.amber.engine.architecture.controller.promisehandlers import edu.uci.ics.amber.engine.architecture.controller.ControllerAsyncRPCHandlerInitializer import edu.uci.ics.amber.engine.architecture.controller.promisehandlers.ReconfigureHandler.Reconfigure -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp +import edu.uci.ics.amber.engine.common.model.PhysicalOp import edu.uci.ics.amber.engine.common.rpc.AsyncRPCServer.ControlCommand import edu.uci.ics.amber.engine.common.virtualidentity.util.SELF import edu.uci.ics.texera.web.service.FriesReconfigurationAlgorithm diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/locationpreference/LocationPreference.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/locationpreference/LocationPreference.scala index a0db81d3ef5..dcf3c4aa932 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/locationpreference/LocationPreference.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/locationpreference/LocationPreference.scala @@ -1,7 +1,7 @@ package edu.uci.ics.amber.engine.architecture.deploysemantics.locationpreference import akka.actor.Address -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp +import edu.uci.ics.amber.engine.common.model.PhysicalOp case class AddressInfo( // the addresses of all worker nodes 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 caa69e9bf42..a77ebc00908 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 @@ -11,12 +11,11 @@ import edu.uci.ics.amber.engine.architecture.messaginglayer.{ } import edu.uci.ics.amber.engine.architecture.pythonworker.WorkerBatchInternalQueue.DataElement import edu.uci.ics.amber.engine.architecture.scheduling.config.WorkerConfig -import edu.uci.ics.amber.engine.common.CheckpointState +import edu.uci.ics.amber.engine.common.{CheckpointState, Utils} 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.virtualidentity.ChannelIdentity -import edu.uci.ics.texera.Utils 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/scheduling/Region.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/Region.scala index f6c19024481..924952e813a 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 @@ -1,7 +1,7 @@ package edu.uci.ics.amber.engine.architecture.scheduling -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.scheduling.config.ResourceConfig +import edu.uci.ics.amber.engine.common.model.PhysicalOp import edu.uci.ics.amber.engine.common.virtualidentity.PhysicalOpIdentity import edu.uci.ics.amber.engine.common.workflow.{PhysicalLink, PortIdentity} import org.jgrapht.graph.{DefaultEdge, DirectedAcyclicGraph} 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 1a18116fe05..54e7a3d2f2a 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 @@ -12,12 +12,12 @@ import edu.uci.ics.amber.engine.architecture.controller.execution.{ WorkflowExecution } import edu.uci.ics.amber.engine.architecture.controller.promisehandlers.LinkWorkersHandler.LinkWorkers -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.InitializeExecutorHandler.InitializeExecutor import edu.uci.ics.amber.engine.architecture.scheduling.config.{OperatorConfig, ResourceConfig} import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.AssignPortHandler.AssignPort import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.OpenExecutorHandler.OpenExecutor import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.StartHandler.StartWorker +import edu.uci.ics.amber.engine.common.model.PhysicalOp import edu.uci.ics.amber.engine.common.rpc.AsyncRPCClient import edu.uci.ics.amber.engine.common.virtualidentity.util.CONTROLLER import edu.uci.ics.amber.engine.common.workflow.PhysicalLink diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/RegionPlanGenerator.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/RegionPlanGenerator.scala index d316047440a..25c0dc44545 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/RegionPlanGenerator.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/scheduling/RegionPlanGenerator.scala @@ -1,12 +1,11 @@ package edu.uci.ics.amber.engine.architecture.scheduling -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.scheduling.RegionPlanGenerator.replaceVertex import edu.uci.ics.amber.engine.architecture.scheduling.resourcePolicies.{ DefaultResourceAllocator, ExecutionClusterInfo } -import edu.uci.ics.amber.engine.common.model.{PhysicalPlan, WorkflowContext} +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, PhysicalPlan, WorkflowContext} import edu.uci.ics.amber.engine.common.virtualidentity.{OperatorIdentity, PhysicalOpIdentity} import edu.uci.ics.amber.engine.common.workflow.PhysicalLink import edu.uci.ics.texera.workflow.common.storage.OpResultStorage 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 bf80d7b3adc..f6be9264f45 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 @@ -1,6 +1,6 @@ package edu.uci.ics.amber.engine.architecture.scheduling.config -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp +import edu.uci.ics.amber.engine.common.model.PhysicalOp import edu.uci.ics.amber.engine.common.{AmberConfig, VirtualIdentityUtils} import edu.uci.ics.amber.engine.common.virtualidentity.ActorVirtualIdentity diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/UpdateExecutorHandler.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/UpdateExecutorHandler.scala index b163de74719..e1be72728cc 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/UpdateExecutorHandler.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/worker/promisehandlers/UpdateExecutorHandler.scala @@ -1,6 +1,5 @@ package edu.uci.ics.amber.engine.architecture.worker.promisehandlers -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.{ OpExecInitInfoWithCode, OpExecInitInfoWithFunc @@ -12,6 +11,7 @@ import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.UpdateExecut UpdateMultipleExecutors } import edu.uci.ics.amber.engine.common.VirtualIdentityUtils +import edu.uci.ics.amber.engine.common.model.PhysicalOp import edu.uci.ics.amber.engine.common.rpc.AsyncRPCServer.ControlCommand import edu.uci.ics.amber.engine.common.virtualidentity.ActorVirtualIdentity import edu.uci.ics.texera.workflow.common.operators.StateTransferFunc diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/AmberConfig.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/AmberConfig.scala index 240ca35943d..9e33cdf18b8 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/AmberConfig.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/AmberConfig.scala @@ -2,7 +2,6 @@ package edu.uci.ics.amber.engine.common import akka.actor.Address import com.typesafe.config.{Config, ConfigFactory} -import edu.uci.ics.texera.Utils import java.io.File import java.net.URI diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/Utils.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/Utils.scala similarity index 99% rename from core/amber/src/main/scala/edu/uci/ics/texera/Utils.scala rename to core/amber/src/main/scala/edu/uci/ics/amber/engine/common/Utils.scala index 57676ac4f6b..17d73d5ae3e 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/Utils.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/Utils.scala @@ -1,4 +1,4 @@ -package edu.uci.ics.texera +package edu.uci.ics.amber.engine.common import com.fasterxml.jackson.annotation.JsonInclude.Include import com.fasterxml.jackson.databind.ObjectMapper diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/PhysicalOp.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/PhysicalOp.scala similarity index 99% rename from core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/PhysicalOp.scala rename to core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/PhysicalOp.scala index 402eeeb4b99..26733420bea 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/architecture/deploysemantics/PhysicalOp.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/PhysicalOp.scala @@ -1,4 +1,4 @@ -package edu.uci.ics.amber.engine.architecture.deploysemantics +package edu.uci.ics.amber.engine.common.model import akka.actor.Deploy import akka.remote.RemoteScope diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/PhysicalPlan.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/PhysicalPlan.scala index 66cc00307c1..5e7f1577a60 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/PhysicalPlan.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/PhysicalPlan.scala @@ -2,7 +2,6 @@ package edu.uci.ics.amber.engine.common.model import com.fasterxml.jackson.annotation.JsonIgnore import com.typesafe.scalalogging.LazyLogging -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.common.VirtualIdentityUtils import edu.uci.ics.amber.engine.common.virtualidentity.{ ActorVirtualIdentity, diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/WorkflowContext.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/WorkflowContext.scala index d17da014738..d1443257fa0 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/WorkflowContext.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/WorkflowContext.scala @@ -7,7 +7,6 @@ import edu.uci.ics.amber.engine.common.model.WorkflowContext.{ DEFAULT_WORKFLOW_SETTINGS } import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.texera.workflow.common.workflow.WorkflowSettings object WorkflowContext { val DEFAULT_EXECUTION_ID: ExecutionIdentity = ExecutionIdentity(1L) diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/WorkflowSettings.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/WorkflowSettings.scala new file mode 100644 index 00000000000..937be62fe73 --- /dev/null +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/WorkflowSettings.scala @@ -0,0 +1,3 @@ +package edu.uci.ics.amber.engine.common.model + +case class WorkflowSettings(dataTransferBatchSize: Int) diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/Tuple.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/Tuple.scala index d91b301a0d8..37b046f29fc 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/Tuple.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/Tuple.scala @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode import com.google.common.base.Preconditions.checkNotNull import Tuple.checkSchemaMatchesFields import TupleUtils.document2Tuple -import edu.uci.ics.texera.Utils +import edu.uci.ics.amber.engine.common.Utils import org.bson.Document import org.ehcache.sizeof.SizeOf diff --git a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/TupleUtils.scala b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/TupleUtils.scala index 8c04f659912..4ff9ae2effa 100644 --- a/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/TupleUtils.scala +++ b/core/amber/src/main/scala/edu/uci/ics/amber/engine/common/model/tuple/TupleUtils.scala @@ -3,7 +3,7 @@ package edu.uci.ics.amber.engine.common.model.tuple import com.fasterxml.jackson.databind.JsonNode import AttributeType._ import AttributeTypeUtils.{inferSchemaFromRows, parseField} -import edu.uci.ics.texera.Utils.objectMapper +import edu.uci.ics.amber.engine.common.Utils.objectMapper import edu.uci.ics.texera.workflow.operators.source.scan.json.JSONUtil.JSONToMap import org.bson.Document import org.bson.types.Binary diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/SessionState.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/SessionState.scala index e8821669ec2..8b40be1bebc 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/SessionState.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/SessionState.scala @@ -1,6 +1,6 @@ package edu.uci.ics.texera.web -import edu.uci.ics.texera.Utils.objectMapper +import edu.uci.ics.amber.engine.common.Utils.objectMapper import edu.uci.ics.texera.web.model.websocket.event.TexeraWebSocketEvent import edu.uci.ics.texera.web.service.WorkflowService import io.reactivex.rxjava3.disposables.Disposable diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWebApplication.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWebApplication.scala index 36b48797bce..85f551b2549 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWebApplication.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWebApplication.scala @@ -7,13 +7,12 @@ import com.github.toastshaman.dropwizard.auth.jwt.JwtAuthFilter import com.typesafe.scalalogging.LazyLogging import edu.uci.ics.amber.engine.architecture.controller.ControllerConfig import edu.uci.ics.amber.engine.common.AmberRuntime.scheduleRecurringCallThroughActorSystem -import edu.uci.ics.amber.engine.common.{AmberConfig, AmberRuntime} +import edu.uci.ics.amber.engine.common.{AmberConfig, AmberRuntime, Utils} import edu.uci.ics.amber.engine.common.client.AmberClient import edu.uci.ics.amber.engine.common.model.{PhysicalPlan, WorkflowContext} import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage import edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity -import edu.uci.ics.texera.Utils -import edu.uci.ics.texera.Utils.{maptoStatusCode, objectMapper} +import Utils.{maptoStatusCode, objectMapper} import edu.uci.ics.texera.web.auth.JwtAuth.jwtConsumer import edu.uci.ics.texera.web.auth.{ GuestAuthFilter, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWorkflowCompilingService.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWorkflowCompilingService.scala index ac60d0af452..ab3fdb4dacb 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWorkflowCompilingService.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/TexeraWorkflowCompilingService.scala @@ -3,8 +3,7 @@ package edu.uci.ics.texera.web import com.fasterxml.jackson.module.scala.DefaultScalaModule import com.github.toastshaman.dropwizard.auth.jwt.JwtAuthFilter import com.typesafe.scalalogging.LazyLogging -import edu.uci.ics.amber.engine.common.AmberConfig -import edu.uci.ics.texera.Utils +import edu.uci.ics.amber.engine.common.{AmberConfig, Utils} import edu.uci.ics.texera.web.auth.JwtAuth.jwtConsumer import edu.uci.ics.texera.web.auth.{ GuestAuthFilter, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/WorkflowExecuteRequest.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/WorkflowExecuteRequest.scala index 04e94187628..6dd0714ec79 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/WorkflowExecuteRequest.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/model/websocket/request/WorkflowExecuteRequest.scala @@ -1,8 +1,9 @@ package edu.uci.ics.texera.web.model.websocket.request import com.fasterxml.jackson.databind.annotation.JsonDeserialize +import edu.uci.ics.amber.engine.common.model.WorkflowSettings import edu.uci.ics.texera.workflow.common.operators.LogicalOp -import edu.uci.ics.texera.workflow.common.workflow.{LogicalLink, WorkflowSettings} +import edu.uci.ics.texera.workflow.common.workflow.LogicalLink case class ReplayExecutionInfo( @JsonDeserialize(contentAs = classOf[java.lang.Long]) diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/CollaborationResource.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/CollaborationResource.scala index 81f6d405c0d..c0a4a33934b 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/CollaborationResource.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/CollaborationResource.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.web.resource import com.typesafe.scalalogging.LazyLogging -import edu.uci.ics.texera.Utils +import edu.uci.ics.amber.engine.common.Utils import edu.uci.ics.texera.web.ServletAwareConfigurator import edu.uci.ics.texera.web.model.collab.event._ import edu.uci.ics.texera.web.model.collab.request._ diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/GoogleResource.java b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/GoogleResource.java index b7fb5ffaa06..3193bb93ec8 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/GoogleResource.java +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/GoogleResource.java @@ -15,7 +15,8 @@ import com.google.api.services.drive.DriveScopes; import com.google.api.services.sheets.v4.Sheets; import com.google.api.services.sheets.v4.SheetsScopes; -import edu.uci.ics.texera.Utils; +import edu.uci.ics.amber.engine.common.Utils; + import java.io.*; import java.security.GeneralSecurityException; diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/SchemaPropagationResource.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/SchemaPropagationResource.scala index 38733e37c83..1a48eca0ae9 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/SchemaPropagationResource.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/SchemaPropagationResource.scala @@ -1,8 +1,8 @@ package edu.uci.ics.texera.web.resource import com.typesafe.scalalogging.LazyLogging +import edu.uci.ics.amber.engine.common.Utils import edu.uci.ics.amber.engine.common.model.{PhysicalPlan, WorkflowContext} import edu.uci.ics.amber.engine.common.virtualidentity.WorkflowIdentity -import edu.uci.ics.texera.Utils import edu.uci.ics.texera.web.auth.SessionUser import edu.uci.ics.texera.web.model.http.response.SchemaPropagationResponse import edu.uci.ics.texera.web.model.websocket.request.LogicalPlanPojo 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 f81c0c09379..b115382bc73 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 @@ -6,7 +6,7 @@ import edu.uci.ics.amber.clustering.ClusterListener import edu.uci.ics.amber.engine.common.model.WorkflowContext import edu.uci.ics.amber.engine.common.virtualidentity.WorkflowIdentity import edu.uci.ics.amber.error.ErrorUtils.getStackTraceWithAllCauses -import edu.uci.ics.texera.Utils.objectMapper +import edu.uci.ics.amber.engine.common.Utils.objectMapper import edu.uci.ics.texera.web.model.jooq.generated.tables.pojos.User import edu.uci.ics.texera.web.model.websocket.event.{ CacheStatusUpdateEvent, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/DatasetAccessResource.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/DatasetAccessResource.scala index e4e940d9f10..f467cce717c 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/DatasetAccessResource.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/DatasetAccessResource.scala @@ -1,6 +1,6 @@ package edu.uci.ics.texera.web.resource.dashboard.user.dataset -import edu.uci.ics.texera.Utils.withTransaction +import edu.uci.ics.amber.engine.common.Utils.withTransaction import edu.uci.ics.texera.web.SqlServer import edu.uci.ics.texera.web.model.common.AccessEntry import edu.uci.ics.texera.web.model.jooq.generated.Tables.USER diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/DatasetResource.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/DatasetResource.scala index 7015770a3bd..aaf99aecaf3 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/DatasetResource.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/DatasetResource.scala @@ -1,6 +1,6 @@ package edu.uci.ics.texera.web.resource.dashboard.user.dataset -import edu.uci.ics.texera.Utils.withTransaction +import edu.uci.ics.amber.engine.common.Utils.withTransaction import edu.uci.ics.texera.web.SqlServer import edu.uci.ics.texera.web.auth.SessionUser import edu.uci.ics.texera.web.model.jooq.generated.enums.DatasetUserAccessPrivilege diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/utils/PathUtils.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/utils/PathUtils.scala index be7bbd338d1..72239cb8037 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/utils/PathUtils.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/dataset/utils/PathUtils.scala @@ -1,6 +1,6 @@ package edu.uci.ics.texera.web.resource.dashboard.user.dataset.utils -import edu.uci.ics.texera.Utils +import edu.uci.ics.amber.engine.common.Utils import org.jooq.types.UInteger import java.nio.file.{Files, Path} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala index b80b48e63ee..6a17f4a6ed6 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala @@ -2,7 +2,7 @@ package edu.uci.ics.texera.web.resource.dashboard.user.workflow import com.flipkart.zjsonpatch.{JsonDiff, JsonPatch} import edu.uci.ics.amber.engine.common.AmberConfig -import edu.uci.ics.texera.Utils.objectMapper +import edu.uci.ics.amber.engine.common.Utils.objectMapper import edu.uci.ics.texera.web.SqlServer import edu.uci.ics.texera.web.auth.SessionUser import edu.uci.ics.texera.web.model.jooq.generated.Tables.WORKFLOW_VERSION 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 a4f86058212..dfcb4b86e60 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 @@ -9,12 +9,11 @@ import edu.uci.ics.amber.engine.architecture.controller.ControllerEvent.{ WorkerAssignmentUpdate } import edu.uci.ics.amber.engine.architecture.worker.statistics.PortTupleCountMapping -import edu.uci.ics.amber.engine.common.AmberConfig +import edu.uci.ics.amber.engine.common.{AmberConfig, Utils} import edu.uci.ics.amber.engine.common.client.AmberClient import edu.uci.ics.amber.engine.common.model.WorkflowContext import edu.uci.ics.amber.error.ErrorUtils.{getOperatorFromActorIdOpt, getStackTraceWithAllCauses} -import edu.uci.ics.texera.Utils -import edu.uci.ics.texera.Utils.maptoStatusCode +import Utils.maptoStatusCode import edu.uci.ics.texera.web.model.jooq.generated.tables.pojos.WorkflowRuntimeStatistics import edu.uci.ics.texera.web.model.jooq.generated.tables.daos.WorkflowRuntimeStatisticsDao import edu.uci.ics.texera.web.{SqlServer, SubscriptionManager} 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 9cacb793245..f4b31bb2f14 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 @@ -1,14 +1,13 @@ package edu.uci.ics.texera.web.service import edu.uci.ics.amber.engine.architecture.controller.promisehandlers.ChannelMarkerHandler.PropagateChannelMarker -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.scheduling.{Region, WorkflowExecutionCoordinator} import edu.uci.ics.amber.engine.architecture.worker.promisehandlers.UpdateExecutorHandler.{ UpdateExecutor, UpdateMultipleExecutors } import edu.uci.ics.amber.engine.common.ambermessage.RequireAlignment -import edu.uci.ics.amber.engine.common.model.PhysicalPlan +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, PhysicalPlan} import edu.uci.ics.amber.engine.common.virtualidentity.{ChannelMarkerIdentity, PhysicalOpIdentity} import edu.uci.ics.texera.workflow.common.operators.StateTransferFunc import org.jgrapht.alg.connectivity.ConnectivityInspector 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 59718804715..2993635bf43 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 @@ -13,7 +13,7 @@ import com.google.api.services.sheets.v4.Sheets import com.google.api.services.sheets.v4.model.{Spreadsheet, SpreadsheetProperties, ValueRange} import edu.uci.ics.amber.engine.common.model.tuple.Tuple import edu.uci.ics.amber.engine.common.virtualidentity.OperatorIdentity -import edu.uci.ics.texera.Utils.retry +import edu.uci.ics.amber.engine.common.Utils.retry import edu.uci.ics.texera.web.model.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 diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowExecutionService.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowExecutionService.scala index f00429d0a95..5887df51e5d 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowExecutionService.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/service/WorkflowExecutionService.scala @@ -3,9 +3,9 @@ package edu.uci.ics.texera.web.service import com.typesafe.scalalogging.LazyLogging import edu.uci.ics.amber.engine.architecture.controller.promisehandlers.StartWorkflowHandler.StartWorkflow import edu.uci.ics.amber.engine.architecture.controller.{ControllerConfig, Workflow} +import edu.uci.ics.amber.engine.common.Utils import edu.uci.ics.amber.engine.common.client.AmberClient import edu.uci.ics.amber.engine.common.model.WorkflowContext -import edu.uci.ics.texera.Utils import edu.uci.ics.texera.web.model.websocket.event.{ TexeraWebSocketEvent, WorkflowErrorEvent, 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 fad1c84e7c3..ecc501fc6cc 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 @@ -1,6 +1,6 @@ package edu.uci.ics.texera.web.storage -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp +import edu.uci.ics.amber.engine.common.model.PhysicalOp import edu.uci.ics.amber.engine.common.virtualidentity.ActorVirtualIdentity import edu.uci.ics.texera.workflow.common.operators.StateTransferFunc diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/ExecutionStateStore.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/ExecutionStateStore.scala index e99c462018a..97db5ba9f5c 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/ExecutionStateStore.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/ExecutionStateStore.scala @@ -1,6 +1,6 @@ package edu.uci.ics.texera.web.storage -import edu.uci.ics.texera.Utils.maptoStatusCode +import edu.uci.ics.amber.engine.common.Utils.maptoStatusCode import edu.uci.ics.texera.web.service.ExecutionsMetadataPersistService import edu.uci.ics.amber.engine.common.workflowruntimestate.{ ExecutionBreakpointStore, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/StateStore.scala b/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/StateStore.scala index 74a7dc8a7a0..d16337f9b9e 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/StateStore.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/web/storage/StateStore.scala @@ -1,6 +1,6 @@ package edu.uci.ics.texera.web.storage -import edu.uci.ics.texera.Utils.withLock +import edu.uci.ics.amber.engine.common.Utils.withLock import edu.uci.ics.texera.web.model.websocket.event.TexeraWebSocketEvent import io.reactivex.rxjava3.core.{Observable, Single} import io.reactivex.rxjava3.disposables.Disposable diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/metadata/OperatorMetadataGenerator.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/metadata/OperatorMetadataGenerator.scala index c0368aecab0..91923a28cfa 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/metadata/OperatorMetadataGenerator.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/metadata/OperatorMetadataGenerator.scala @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.jsontype.NamedType import com.fasterxml.jackson.databind.node.{ArrayNode, ObjectNode} import com.kjetland.jackson.jsonSchema.JsonSchemaConfig.html5EnabledSchema import com.kjetland.jackson.jsonSchema.{JsonSchemaConfig, JsonSchemaDraft, JsonSchemaGenerator} -import edu.uci.ics.texera.Utils.objectMapper +import edu.uci.ics.amber.engine.common.Utils.objectMapper import edu.uci.ics.texera.workflow.common.operators.LogicalOp import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.operators.source.scan.csv.CSVScanSourceOpDesc diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/LogicalOp.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/LogicalOp.scala index e12985e8e29..be68212a96f 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/LogicalOp.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/LogicalOp.scala @@ -9,9 +9,8 @@ import com.fasterxml.jackson.annotation.{ JsonTypeInfo } import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.common.executor.OperatorExecutor -import edu.uci.ics.amber.engine.common.model.{PhysicalPlan, WorkflowContext} +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, PhysicalPlan, WorkflowContext} import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ ExecutionIdentity, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/PythonOperatorDescriptor.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/PythonOperatorDescriptor.scala index bbda687084f..689652e144c 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/PythonOperatorDescriptor.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/PythonOperatorDescriptor.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.common.operators import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfoWithCode -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} trait PythonOperatorDescriptor extends LogicalOp { diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/filter/FilterOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/filter/FilterOpDesc.scala index 6a6edf73a7a..7b14f7386a8 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/filter/FilterOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/filter/FilterOpDesc.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.common.operators.filter import com.google.common.base.Preconditions -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp +import edu.uci.ics.amber.engine.common.model.PhysicalOp import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.operators.{LogicalOp, StateTransferFunc} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/map/MapOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/map/MapOpDesc.scala index 01f1efc926e..538e00f0875 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/map/MapOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/operators/map/MapOpDesc.scala @@ -1,6 +1,6 @@ package edu.uci.ics.texera.workflow.common.operators.map -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp +import edu.uci.ics.amber.engine.common.model.PhysicalOp import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.operators.{LogicalOp, StateTransferFunc} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/WorkflowCompiler.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/WorkflowCompiler.scala index 7cb26a72181..efa4e305275 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/WorkflowCompiler.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/WorkflowCompiler.scala @@ -7,7 +7,7 @@ import edu.uci.ics.amber.engine.common.model.{PhysicalPlan, WorkflowContext} import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.OperatorIdentity import edu.uci.ics.amber.error.ErrorUtils.getStackTraceWithAllCauses -import edu.uci.ics.texera.Utils.objectMapper +import edu.uci.ics.amber.engine.common.Utils.objectMapper import edu.uci.ics.texera.web.model.websocket.request.LogicalPlanPojo import edu.uci.ics.texera.web.service.ExecutionsMetadataPersistService import edu.uci.ics.texera.web.storage.ExecutionStateStore diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/WorkflowSettings.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/WorkflowSettings.scala deleted file mode 100644 index f79b1727b9f..00000000000 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/common/workflow/WorkflowSettings.scala +++ /dev/null @@ -1,12 +0,0 @@ -package edu.uci.ics.texera.workflow.common.workflow - -import edu.uci.ics.amber.engine.common.AmberConfig - -object WorkflowSettings { - def apply( - dataTransferBatchSize: Int = AmberConfig.defaultDataTransferBatchSize - ): WorkflowSettings = - new WorkflowSettings(dataTransferBatchSize) -} - -class WorkflowSettings(var dataTransferBatchSize: Int = AmberConfig.defaultDataTransferBatchSize) diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregateOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregateOpDesc.scala index 2baef8207a5..63cb5ced6e8 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregateOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/aggregate/AggregateOpDesc.scala @@ -2,9 +2,8 @@ package edu.uci.ics.texera.workflow.operators.aggregate import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo -import edu.uci.ics.amber.engine.common.model.PhysicalPlan +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, PhysicalPlan, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ ExecutionIdentity, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpDesc.scala index 7a3681fb8b3..1cee7475e69 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/cartesianProduct/CartesianProductOpDesc.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.cartesianProduct -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, PortIdentity} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpDesc.scala index cf9d617cf53..df0c2a6651d 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpDesc.scala @@ -2,8 +2,8 @@ package edu.uci.ics.texera.workflow.operators.dictionary import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.google.common.base.Preconditions -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpExec.scala index 890b0c76476..676a358d389 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/dictionary/DictionaryMatcherOpExec.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.dictionary +import edu.uci.ics.amber.engine.common.Utils import edu.uci.ics.amber.engine.common.model.tuple.{Tuple, TupleLike} -import edu.uci.ics.texera.Utils import edu.uci.ics.texera.workflow.common.operators.map.MapOpExec import org.apache.lucene.analysis.Analyzer import org.apache.lucene.analysis.en.EnglishAnalyzer diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpDesc.scala index c4862bf0b30..afe5455a3db 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/difference/DifferenceOpDesc.scala @@ -1,8 +1,8 @@ package edu.uci.ics.texera.workflow.operators.difference import com.google.common.base.Preconditions -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.PhysicalOp import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, PortIdentity} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpDesc.scala index 199b7550627..8c0548e7510 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/distinct/DistinctOpDesc.scala @@ -1,8 +1,8 @@ package edu.uci.ics.texera.workflow.operators.distinct import com.google.common.base.Preconditions -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.PhysicalOp import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpDesc.scala index ea450857138..c55bbc7916f 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/download/BulkDownloaderOpDesc.scala @@ -3,8 +3,8 @@ package edu.uci.ics.texera.workflow.operators.download import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.google.common.base.Preconditions import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/filter/SpecializedFilterOpDesc.java b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/filter/SpecializedFilterOpDesc.java index 83f5595008e..f6d7066bb19 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/filter/SpecializedFilterOpDesc.java +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/filter/SpecializedFilterOpDesc.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp; +import edu.uci.ics.amber.engine.common.model.PhysicalOp; import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo; import edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity; import edu.uci.ics.amber.engine.common.virtualidentity.WorkflowIdentity; diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinOpDesc.scala index d3c3b8d3412..4ccd5a66d0e 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/hashJoin/HashJoinOpDesc.scala @@ -3,9 +3,8 @@ package edu.uci.ics.texera.workflow.operators.hashJoin import edu.uci.ics.texera.workflow.operators.hashJoin.HashJoinOpDesc.HASH_JOIN_INTERNAL_KEY_NAME import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo -import edu.uci.ics.amber.engine.common.model.PhysicalPlan +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, PhysicalPlan, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ ExecutionIdentity, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpDesc.scala index 90d4c8206c4..fc599059f07 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intersect/IntersectOpDesc.scala @@ -1,8 +1,8 @@ package edu.uci.ics.texera.workflow.operators.intersect import com.google.common.base.Preconditions -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.PhysicalOp import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, PortIdentity} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalJoinOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalJoinOpDesc.scala index e4ce6bee0ef..987dc2aac44 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalJoinOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/intervalJoin/IntervalJoinOpDesc.scala @@ -3,8 +3,8 @@ package edu.uci.ics.texera.workflow.operators.intervalJoin import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, PortIdentity} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/keywordSearch/KeywordSearchOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/keywordSearch/KeywordSearchOpDesc.scala index 0f79e2cda94..505368fd9ba 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/keywordSearch/KeywordSearchOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/keywordSearch/KeywordSearchOpDesc.scala @@ -2,8 +2,8 @@ package edu.uci.ics.texera.workflow.operators.keywordSearch import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.PhysicalOp import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/limit/LimitOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/limit/LimitOpDesc.scala index 6ffaec9f94c..93193c88da0 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/limit/LimitOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/limit/LimitOpDesc.scala @@ -2,8 +2,8 @@ package edu.uci.ics.texera.workflow.operators.limit import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.PhysicalOp import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpDesc.scala index e90903439e2..6f6118b9d9a 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/projection/ProjectionOpDesc.scala @@ -3,9 +3,9 @@ package edu.uci.ics.texera.workflow.operators.projection import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.google.common.base.Preconditions import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp.oneToOnePhysicalOp +import edu.uci.ics.amber.engine.common.model.PhysicalOp.oneToOnePhysicalOp import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/randomksampling/RandomKSamplingOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/randomksampling/RandomKSamplingOpDesc.scala index 937e39dba53..043d0845fc8 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/randomksampling/RandomKSamplingOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/randomksampling/RandomKSamplingOpDesc.scala @@ -1,9 +1,9 @@ package edu.uci.ics.texera.workflow.operators.randomksampling import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty, JsonPropertyDescription} -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo import edu.uci.ics.amber.engine.common.AmberConfig +import edu.uci.ics.amber.engine.common.model.PhysicalOp import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/regex/RegexOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/regex/RegexOpDesc.scala index d19bb4f6078..8cdb421c609 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/regex/RegexOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/regex/RegexOpDesc.scala @@ -2,8 +2,8 @@ package edu.uci.ics.texera.workflow.operators.regex import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.PhysicalOp import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/reservoirsampling/ReservoirSamplingOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/reservoirsampling/ReservoirSamplingOpDesc.scala index 51f4cbe12cd..226de2aa956 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/reservoirsampling/ReservoirSamplingOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/reservoirsampling/ReservoirSamplingOpDesc.scala @@ -2,9 +2,9 @@ package edu.uci.ics.texera.workflow.operators.reservoirsampling import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty, JsonPropertyDescription} import com.google.common.base.Preconditions -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo import edu.uci.ics.amber.engine.common.AmberConfig +import edu.uci.ics.amber.engine.common.model.PhysicalOp import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sentiment/SentimentAnalysisOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sentiment/SentimentAnalysisOpDesc.scala index 9c334197b3c..b69b5dc0515 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sentiment/SentimentAnalysisOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sentiment/SentimentAnalysisOpDesc.scala @@ -2,8 +2,8 @@ package edu.uci.ics.texera.workflow.operators.sentiment import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaInject -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpDesc.java b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpDesc.java index e333855526d..c630c62560c 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpDesc.java +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sink/managed/ProgressiveSinkOpDesc.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.google.common.base.Preconditions; -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp; -import edu.uci.ics.amber.engine.architecture.deploysemantics.SchemaPropagationFunc; +import edu.uci.ics.amber.engine.common.model.PhysicalOp; +import edu.uci.ics.amber.engine.common.model.SchemaPropagationFunc; import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo; import edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity; import edu.uci.ics.amber.engine.common.virtualidentity.OperatorIdentity; diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionsOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionsOpDesc.scala index 806e49cfbbd..ce090701fed 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionsOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/sortPartitions/SortPartitionsOpDesc.scala @@ -3,8 +3,8 @@ package edu.uci.ics.texera.workflow.operators.sortPartitions import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.google.common.base.Preconditions import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.PhysicalOp import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala index ebc58b82299..4af4885c8d7 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterFullArchiveSearchSourceOpDesc.scala @@ -6,8 +6,8 @@ import com.kjetland.jackson.jsonSchema.annotations.{ JsonSchemaInject, JsonSchemaTitle } -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.metadata.annotations.UIWidget diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala index a4bceb3daf1..0be04b6e030 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/apis/twitter/v2/TwitterSearchSourceOpDesc.scala @@ -6,8 +6,8 @@ import com.kjetland.jackson.jsonSchema.annotations.{ JsonSchemaInject, JsonSchemaTitle } -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.metadata.annotations.UIWidget diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/cache/CacheSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/cache/CacheSourceOpDesc.scala index ced93e97aea..8a60c0bab30 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/cache/CacheSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/cache/CacheSourceOpDesc.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.source.cache import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ ExecutionIdentity, diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/fetcher/URLFetcherOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/fetcher/URLFetcherOpDesc.scala index 153d8c73ced..b3d1cd01c8e 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/fetcher/URLFetcherOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/fetcher/URLFetcherOpDesc.scala @@ -2,8 +2,8 @@ package edu.uci.ics.texera.workflow.operators.source.fetcher import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.OutputPort diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/FileScanSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/FileScanSourceOpDesc.scala index 0a897a538b9..daa4c3864b5 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/FileScanSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/FileScanSourceOpDesc.scala @@ -6,8 +6,8 @@ import com.kjetland.jackson.jsonSchema.annotations.{ JsonSchemaString, JsonSchemaTitle } -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.metadata.annotations.HideAnnotation diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpDesc.scala index edd407f6a89..e9336f2acec 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/CSVScanSourceOpDesc.scala @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import com.univocity.parsers.csv.{CsvFormat, CsvParser, CsvParserSettings} -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.inferSchemaFromRows import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/ParallelCSVScanSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/ParallelCSVScanSourceOpDesc.scala index 6058893ef2a..4c1a4a98f26 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/ParallelCSVScanSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csv/ParallelCSVScanSourceOpDesc.scala @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.github.tototoshi.csv.{CSVReader, DefaultCSVFormat} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.inferSchemaFromRows import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csvOld/CSVOldScanSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csvOld/CSVOldScanSourceOpDesc.scala index 4ea923e833c..ca17df52a26 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csvOld/CSVOldScanSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/csvOld/CSVOldScanSourceOpDesc.scala @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.github.tototoshi.csv.{CSVReader, DefaultCSVFormat} import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.inferSchemaFromRows import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/json/JSONLScanSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/json/JSONLScanSourceOpDesc.scala index 0c409351777..e3c3bcd6027 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/json/JSONLScanSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/json/JSONLScanSourceOpDesc.scala @@ -2,11 +2,11 @@ package edu.uci.ics.texera.workflow.operators.source.scan.json import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.fasterxml.jackson.databind.JsonNode -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.storage.DatasetFileDocument import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} -import edu.uci.ics.texera.Utils.objectMapper +import edu.uci.ics.amber.engine.common.Utils.objectMapper import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.inferSchemaFromRows import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, Schema} import edu.uci.ics.texera.workflow.operators.source.scan.ScanSourceOpDesc diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/json/JSONLScanSourceOpExec.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/json/JSONLScanSourceOpExec.scala index abb9c09a48b..e57f93021ec 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/json/JSONLScanSourceOpExec.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/json/JSONLScanSourceOpExec.scala @@ -2,7 +2,7 @@ package edu.uci.ics.texera.workflow.operators.source.scan.json import edu.uci.ics.amber.engine.common.executor.SourceOperatorExecutor import edu.uci.ics.amber.engine.common.storage.DatasetFileDocument -import edu.uci.ics.texera.Utils.objectMapper +import edu.uci.ics.amber.engine.common.Utils.objectMapper import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.parseField import edu.uci.ics.amber.engine.common.model.tuple.{Schema, TupleLike} import edu.uci.ics.texera.workflow.operators.source.scan.FileDecodingMethod diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/TextInputSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/TextInputSourceOpDesc.scala index b2e8fd06078..546faea3abc 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/TextInputSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/scan/text/TextInputSourceOpDesc.scala @@ -2,8 +2,8 @@ package edu.uci.ics.texera.workflow.operators.source.scan.text import com.fasterxml.jackson.annotation.JsonProperty import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.OutputPort diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/asterixdb/AsterixDBSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/asterixdb/AsterixDBSourceOpDesc.scala index de03fa46c10..03e690889d9 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/asterixdb/AsterixDBSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/asterixdb/AsterixDBSourceOpDesc.scala @@ -7,8 +7,8 @@ import com.fasterxml.jackson.annotation.{ } import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.OutputPort diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/mysql/MySQLSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/mysql/MySQLSourceOpDesc.scala index 6efe7409506..a4fdb25e0bf 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/mysql/MySQLSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/mysql/MySQLSourceOpDesc.scala @@ -1,7 +1,7 @@ package edu.uci.ics.texera.workflow.operators.source.sql.mysql -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.OutputPort import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/postgresql/PostgreSQLSourceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/postgresql/PostgreSQLSourceOpDesc.scala index a90070b599c..3693f627a51 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/postgresql/PostgreSQLSourceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/source/sql/postgresql/PostgreSQLSourceOpDesc.scala @@ -3,8 +3,8 @@ package edu.uci.ics.texera.workflow.operators.source.sql.postgresql import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.OutputPort import edu.uci.ics.texera.workflow.common.metadata.annotations.UIWidget diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/split/SplitOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/split/SplitOpDesc.scala index dbc46c7386d..ffa9dfab0d3 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/split/SplitOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/split/SplitOpDesc.scala @@ -2,8 +2,8 @@ package edu.uci.ics.texera.workflow.operators.split import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.google.common.base.Preconditions -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, PortIdentity} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpDesc.scala index 30e7e471129..702b8773d46 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/symmetricDifference/SymmetricDifferenceOpDesc.scala @@ -1,8 +1,8 @@ package edu.uci.ics.texera.workflow.operators.symmetricDifference import com.google.common.base.Preconditions -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.PhysicalOp import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpDesc.java b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpDesc.java index 4939012334d..65250f19562 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpDesc.java +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/typecasting/TypeCastingOpDesc.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle; -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp; -import edu.uci.ics.amber.engine.architecture.deploysemantics.SchemaPropagationFunc; +import edu.uci.ics.amber.engine.common.model.PhysicalOp; +import edu.uci.ics.amber.engine.common.model.SchemaPropagationFunc; import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo; import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils; import edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity; diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/java/JavaUDFOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/java/JavaUDFOpDesc.scala index 50c926aa500..3ee9e6f89cb 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/java/JavaUDFOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/java/JavaUDFOpDesc.scala @@ -3,8 +3,8 @@ package edu.uci.ics.texera.workflow.operators.udf.java import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.google.common.base.Preconditions import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, PortIdentity} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/DualInputPortsPythonUDFOpDescV2.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/DualInputPortsPythonUDFOpDescV2.scala index af3bd06678c..c574d5df281 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/DualInputPortsPythonUDFOpDescV2.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/DualInputPortsPythonUDFOpDescV2.scala @@ -3,8 +3,8 @@ package edu.uci.ics.texera.workflow.operators.udf.python import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.google.common.base.Preconditions import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/PythonUDFOpDescV2.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/PythonUDFOpDescV2.scala index 9edf5d6f025..5ea14eb1540 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/PythonUDFOpDescV2.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/PythonUDFOpDescV2.scala @@ -3,8 +3,8 @@ package edu.uci.ics.texera.workflow.operators.udf.python import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.google.common.base.Preconditions import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/source/PythonUDFSourceOpDescV2.java b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/source/PythonUDFSourceOpDescV2.java index ac9e315414d..87e8b44a58b 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/source/PythonUDFSourceOpDescV2.java +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/source/PythonUDFSourceOpDescV2.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.google.common.base.Preconditions; import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle; -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp; -import edu.uci.ics.amber.engine.architecture.deploysemantics.SchemaPropagationFunc; +import edu.uci.ics.amber.engine.common.model.PhysicalOp; +import edu.uci.ics.amber.engine.common.model.SchemaPropagationFunc; import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo; import edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity; import edu.uci.ics.amber.engine.common.virtualidentity.WorkflowIdentity; diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/r/RUDFOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/r/RUDFOpDesc.scala index 19eae408286..4dc5f0ea8c8 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/r/RUDFOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/r/RUDFOpDesc.scala @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.google.common.base.Preconditions import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.amber.engine.common.workflow.{InputPort, OutputPort, PortIdentity} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/r/RUDFSourceOpDesc.java b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/r/RUDFSourceOpDesc.java index 41ab1ca10ed..7579774ec66 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/r/RUDFSourceOpDesc.java +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/r/RUDFSourceOpDesc.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.google.common.base.Preconditions; import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle; -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp; -import edu.uci.ics.amber.engine.architecture.deploysemantics.SchemaPropagationFunc; +import edu.uci.ics.amber.engine.common.model.PhysicalOp; +import edu.uci.ics.amber.engine.common.model.SchemaPropagationFunc; import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo; import edu.uci.ics.amber.engine.common.virtualidentity.ExecutionIdentity; import edu.uci.ics.amber.engine.common.virtualidentity.WorkflowIdentity; diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/union/UnionOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/union/UnionOpDesc.scala index f1d56641ce4..d69f9403d5c 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/union/UnionOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/union/UnionOpDesc.scala @@ -1,8 +1,8 @@ package edu.uci.ics.texera.workflow.operators.union import com.google.common.base.Preconditions -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.PhysicalOp import edu.uci.ics.amber.engine.common.model.tuple.Schema import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/unneststring/UnnestStringOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/unneststring/UnnestStringOpDesc.scala index 09ba5717a65..7177856f3dd 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/unneststring/UnnestStringOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/unneststring/UnnestStringOpDesc.scala @@ -2,8 +2,8 @@ package edu.uci.ics.texera.workflow.operators.unneststring import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription} import com.google.common.base.Preconditions -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.metadata.{OperatorGroupConstants, OperatorInfo} diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpDesc.scala index 3dce9f2dd85..fdeb9587863 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/htmlviz/HtmlVizOpDesc.scala @@ -2,8 +2,8 @@ package edu.uci.ics.texera.workflow.operators.visualization.htmlviz import com.fasterxml.jackson.annotation.JsonProperty import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName diff --git a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/urlviz/UrlVizOpDesc.scala b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/urlviz/UrlVizOpDesc.scala index 2ef5be383c8..ad748577b3b 100644 --- a/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/urlviz/UrlVizOpDesc.scala +++ b/core/amber/src/main/scala/edu/uci/ics/texera/workflow/operators/visualization/urlviz/UrlVizOpDesc.scala @@ -2,8 +2,8 @@ package edu.uci.ics.texera.workflow.operators.visualization.urlviz import com.fasterxml.jackson.annotation.JsonProperty import com.kjetland.jackson.jsonSchema.annotations.{JsonSchemaInject, JsonSchemaTitle} -import edu.uci.ics.amber.engine.architecture.deploysemantics.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecInitInfo +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, SchemaPropagationFunc} import edu.uci.ics.amber.engine.common.model.tuple.{Attribute, AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ExecutionIdentity, WorkflowIdentity} import edu.uci.ics.texera.workflow.common.metadata.annotations.AutofillAttributeName diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/web/MockTexeraDB.scala b/core/amber/src/test/scala/edu/uci/ics/texera/web/MockTexeraDB.scala index efcd97a319b..95355fb9ced 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/web/MockTexeraDB.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/web/MockTexeraDB.scala @@ -4,7 +4,7 @@ import com.mysql.cj.jdbc.MysqlDataSource import org.jooq.DSLContext import org.jooq.impl.DSL import ch.vorburger.mariadb4j.{DB, DBConfigurationBuilder} -import edu.uci.ics.texera.Utils +import edu.uci.ics.amber.engine.common.Utils import java.io.{File, FileInputStream, InputStream} import java.nio.file.Path diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/workflow/SchemaPropagationSpec.scala b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/workflow/SchemaPropagationSpec.scala index d739c908ea2..9e800a789e9 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/workflow/SchemaPropagationSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/workflow/SchemaPropagationSpec.scala @@ -1,7 +1,6 @@ package edu.uci.ics.texera.workflow.common.workflow -import edu.uci.ics.amber.engine.architecture.deploysemantics.PhysicalOp -import edu.uci.ics.amber.engine.common.model.WorkflowContext +import edu.uci.ics.amber.engine.common.model.{PhysicalOp, WorkflowContext} import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Schema} import edu.uci.ics.amber.engine.common.virtualidentity.{ ExecutionIdentity, From aef34d7f180d51cd0d7a561638de3d9d58e64329 Mon Sep 17 00:00:00 2001 From: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com> Date: Wed, 9 Oct 2024 11:04:42 -0700 Subject: [PATCH 6/7] fix test --- .../common/model/tuple}/AttributeTypeUtilsSpec.scala | 8 +++----- .../engine/common/model}/tuple/TupleSpec.scala | 12 ++---------- .../ics/amber/engine/e2e/DataProcessingSpec.scala | 2 +- .../edu/uci/ics/amber/engine/e2e/PauseSpec.scala | 2 +- .../amber/engine/faulttolerance/CheckpointSpec.scala | 2 +- 5 files changed, 8 insertions(+), 18 deletions(-) rename core/amber/src/test/scala/edu/uci/ics/{texera/workflow/common/tuple/schema => amber/engine/common/model/tuple}/AttributeTypeUtilsSpec.scala (95%) rename core/amber/src/test/scala/edu/uci/ics/{texera/workflow/common => amber/engine/common/model}/tuple/TupleSpec.scala (96%) diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/tuple/schema/AttributeTypeUtilsSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/common/model/tuple/AttributeTypeUtilsSpec.scala similarity index 95% rename from core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/tuple/schema/AttributeTypeUtilsSpec.scala rename to core/amber/src/test/scala/edu/uci/ics/amber/engine/common/model/tuple/AttributeTypeUtilsSpec.scala index 97c8259114f..59467726728 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/tuple/schema/AttributeTypeUtilsSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/common/model/tuple/AttributeTypeUtilsSpec.scala @@ -1,9 +1,7 @@ -package edu.uci.ics.texera.workflow.common.tuple.schema +package edu.uci.ics.amber.engine.common.model.tuple -import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.{ - inferField, - inferSchemaFromRows -} +import edu.uci.ics.amber.engine.common.model.tuple.AttributeType._ +import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.{inferField, inferSchemaFromRows} import org.scalatest.funsuite.AnyFunSuite class AttributeTypeUtilsSpec extends AnyFunSuite { diff --git a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/tuple/TupleSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/common/model/tuple/TupleSpec.scala similarity index 96% rename from core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/tuple/TupleSpec.scala rename to core/amber/src/test/scala/edu/uci/ics/amber/engine/common/model/tuple/TupleSpec.scala index 074c4edfc4a..f5fbcbc56d0 100644 --- a/core/amber/src/test/scala/edu/uci/ics/texera/workflow/common/tuple/TupleSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/common/model/tuple/TupleSpec.scala @@ -1,14 +1,6 @@ -package edu.uci.ics.texera.workflow.common.tuple - -import edu.uci.ics.amber.engine.common.model.tuple.{ - Attribute, - AttributeType, - Schema, - Tuple, - TupleBuildingException -} +package edu.uci.ics.amber.engine.common.model.tuple + import edu.uci.ics.amber.engine.common.model.tuple.TupleUtils.{json2tuple, tuple2json} -import edu.uci.ics.texera.workflow.common.tuple.exception.TupleBuildingException import org.scalatest.flatspec.AnyFlatSpec import java.sql.Timestamp 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 6a8fd938909..43c710509a1 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 @@ -17,7 +17,7 @@ import edu.uci.ics.amber.engine.common.model.tuple.{AttributeType, Tuple} import edu.uci.ics.amber.engine.common.virtualidentity.OperatorIdentity import edu.uci.ics.amber.engine.common.workflow.PortIdentity import edu.uci.ics.amber.engine.e2e.TestUtils.buildWorkflow -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.COMPLETED +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.COMPLETED import edu.uci.ics.texera.workflow.common.storage.OpResultStorage import edu.uci.ics.texera.workflow.common.workflow._ import edu.uci.ics.texera.workflow.operators.aggregate.AggregationFunction 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 4d50a255427..9027cccea1b 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 @@ -13,7 +13,7 @@ import edu.uci.ics.amber.engine.architecture.controller.promisehandlers.ResumeHa import edu.uci.ics.amber.engine.architecture.controller.promisehandlers.StartWorkflowHandler.StartWorkflow import edu.uci.ics.amber.engine.common.client.AmberClient import edu.uci.ics.amber.engine.common.workflow.PortIdentity -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.COMPLETED +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.COMPLETED import edu.uci.ics.texera.workflow.common.operators.LogicalOp import edu.uci.ics.texera.workflow.common.storage.OpResultStorage import edu.uci.ics.texera.workflow.common.workflow.LogicalLink 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 28a03a31920..9bb0913aa25 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 @@ -30,7 +30,7 @@ import edu.uci.ics.amber.engine.common.virtualidentity.util.{CONTROLLER, SELF} import edu.uci.ics.amber.engine.common.workflow.PortIdentity import edu.uci.ics.amber.engine.e2e.TestOperators import edu.uci.ics.amber.engine.e2e.TestUtils.buildWorkflow -import edu.uci.ics.texera.web.workflowruntimestate.WorkflowAggregatedState.{COMPLETED, PAUSED} +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.{COMPLETED, PAUSED} import edu.uci.ics.texera.workflow.common.storage.OpResultStorage import edu.uci.ics.texera.workflow.common.workflow.LogicalLink import org.scalatest.BeforeAndAfterAll From b75b2172f400f8dd53bece2021047a0444c46403 Mon Sep 17 00:00:00 2001 From: Yicong Huang <17627829+Yicong-Huang@users.noreply.github.com> Date: Wed, 9 Oct 2024 11:05:26 -0700 Subject: [PATCH 7/7] fix format --- .../engine/common/model/tuple/AttributeTypeUtilsSpec.scala | 5 ++++- .../uci/ics/amber/engine/faulttolerance/CheckpointSpec.scala | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/amber/src/test/scala/edu/uci/ics/amber/engine/common/model/tuple/AttributeTypeUtilsSpec.scala b/core/amber/src/test/scala/edu/uci/ics/amber/engine/common/model/tuple/AttributeTypeUtilsSpec.scala index 59467726728..8e5ebc06521 100644 --- a/core/amber/src/test/scala/edu/uci/ics/amber/engine/common/model/tuple/AttributeTypeUtilsSpec.scala +++ b/core/amber/src/test/scala/edu/uci/ics/amber/engine/common/model/tuple/AttributeTypeUtilsSpec.scala @@ -1,7 +1,10 @@ package edu.uci.ics.amber.engine.common.model.tuple import edu.uci.ics.amber.engine.common.model.tuple.AttributeType._ -import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.{inferField, inferSchemaFromRows} +import edu.uci.ics.amber.engine.common.model.tuple.AttributeTypeUtils.{ + inferField, + inferSchemaFromRows +} import org.scalatest.funsuite.AnyFunSuite class AttributeTypeUtilsSpec extends AnyFunSuite { 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 9bb0913aa25..4570b1e38d6 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 @@ -30,7 +30,10 @@ import edu.uci.ics.amber.engine.common.virtualidentity.util.{CONTROLLER, SELF} import edu.uci.ics.amber.engine.common.workflow.PortIdentity import edu.uci.ics.amber.engine.e2e.TestOperators import edu.uci.ics.amber.engine.e2e.TestUtils.buildWorkflow -import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.{COMPLETED, PAUSED} +import edu.uci.ics.amber.engine.common.workflowruntimestate.WorkflowAggregatedState.{ + COMPLETED, + PAUSED +} import edu.uci.ics.texera.workflow.common.storage.OpResultStorage import edu.uci.ics.texera.workflow.common.workflow.LogicalLink import org.scalatest.BeforeAndAfterAll