This is an automated email from the ASF dual-hosted git repository.
yiconghuang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/texera.git
The following commit(s) were added to refs/heads/main by this push:
new b274c0a22a chore: relocate workflow-compiling-service (#3868)
b274c0a22a is described below
commit b274c0a22a602565b8b40d095bdef13371920638
Author: Yicong Huang <[email protected]>
AuthorDate: Sun Oct 12 09:52:44 2025 -0700
chore: relocate workflow-compiling-service (#3868)
According to the reorganization plan #3846. This PR moves
`core/workflow-compiling-service` out to root.
resolves #3860
---------
Signed-off-by: Yicong Huang <[email protected]>
---
build.sbt | 2 +-
core/config/src/main/scala/org/apache/amber/util/PathUtils.scala | 2 --
.../build.sbt | 0
.../project/build.properties | 0
.../src/main/resources/workflow-compiling-service-config.yaml | 0
.../main/scala/org/apache/amber/compiler/WorkflowCompiler.scala | 0
.../main/scala/org/apache/amber/compiler/model/LogicalLink.scala | 0
.../main/scala/org/apache/amber/compiler/model/LogicalPlan.scala | 0
.../scala/org/apache/amber/compiler/model/LogicalPlanPojo.scala | 0
.../scala/org/apache/texera/service/WorkflowCompilingService.scala | 7 +++++--
.../texera/service/WorkflowCompilingServiceConfiguration.scala | 0
.../org/apache/texera/service/resource/HealthCheckResource.scala | 0
.../texera/service/resource/WorkflowCompilationResource.scala | 0
.../src/test/resources/country_sales_small.csv | 0
.../texera/service/resource/WorkflowCompilationResourceSpec.scala | 2 +-
15 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/build.sbt b/build.sbt
index 93717181aa..38dafbf168 100644
--- a/build.sbt
+++ b/build.sbt
@@ -63,7 +63,7 @@ lazy val FileService = (project in file("core/file-service"))
)
lazy val WorkflowOperator = (project in
file("core/workflow-operator")).dependsOn(WorkflowCore)
-lazy val WorkflowCompilingService = (project in
file("core/workflow-compiling-service"))
+lazy val WorkflowCompilingService = (project in
file("workflow-compiling-service"))
.dependsOn(WorkflowOperator, Config)
.settings(
dependencyOverrides ++= Seq(
diff --git a/core/config/src/main/scala/org/apache/amber/util/PathUtils.scala
b/core/config/src/main/scala/org/apache/amber/util/PathUtils.scala
index 6fb12c990d..0cbf40ec3b 100644
--- a/core/config/src/main/scala/org/apache/amber/util/PathUtils.scala
+++ b/core/config/src/main/scala/org/apache/amber/util/PathUtils.scala
@@ -54,8 +54,6 @@ object PathUtils {
}
}
- lazy val workflowCompilingServicePath: Path =
corePath.resolve("workflow-compiling-service")
-
lazy val fileServicePath: Path = corePath.resolve("file-service")
lazy val configServicePath: Path = corePath.resolve("config-service")
diff --git a/core/workflow-compiling-service/build.sbt
b/workflow-compiling-service/build.sbt
similarity index 100%
rename from core/workflow-compiling-service/build.sbt
rename to workflow-compiling-service/build.sbt
diff --git a/core/workflow-compiling-service/project/build.properties
b/workflow-compiling-service/project/build.properties
similarity index 100%
rename from core/workflow-compiling-service/project/build.properties
rename to workflow-compiling-service/project/build.properties
diff --git
a/core/workflow-compiling-service/src/main/resources/workflow-compiling-service-config.yaml
b/workflow-compiling-service/src/main/resources/workflow-compiling-service-config.yaml
similarity index 100%
rename from
core/workflow-compiling-service/src/main/resources/workflow-compiling-service-config.yaml
rename to
workflow-compiling-service/src/main/resources/workflow-compiling-service-config.yaml
diff --git
a/core/workflow-compiling-service/src/main/scala/org/apache/amber/compiler/WorkflowCompiler.scala
b/workflow-compiling-service/src/main/scala/org/apache/amber/compiler/WorkflowCompiler.scala
similarity index 100%
rename from
core/workflow-compiling-service/src/main/scala/org/apache/amber/compiler/WorkflowCompiler.scala
rename to
workflow-compiling-service/src/main/scala/org/apache/amber/compiler/WorkflowCompiler.scala
diff --git
a/core/workflow-compiling-service/src/main/scala/org/apache/amber/compiler/model/LogicalLink.scala
b/workflow-compiling-service/src/main/scala/org/apache/amber/compiler/model/LogicalLink.scala
similarity index 100%
rename from
core/workflow-compiling-service/src/main/scala/org/apache/amber/compiler/model/LogicalLink.scala
rename to
workflow-compiling-service/src/main/scala/org/apache/amber/compiler/model/LogicalLink.scala
diff --git
a/core/workflow-compiling-service/src/main/scala/org/apache/amber/compiler/model/LogicalPlan.scala
b/workflow-compiling-service/src/main/scala/org/apache/amber/compiler/model/LogicalPlan.scala
similarity index 100%
rename from
core/workflow-compiling-service/src/main/scala/org/apache/amber/compiler/model/LogicalPlan.scala
rename to
workflow-compiling-service/src/main/scala/org/apache/amber/compiler/model/LogicalPlan.scala
diff --git
a/core/workflow-compiling-service/src/main/scala/org/apache/amber/compiler/model/LogicalPlanPojo.scala
b/workflow-compiling-service/src/main/scala/org/apache/amber/compiler/model/LogicalPlanPojo.scala
similarity index 100%
rename from
core/workflow-compiling-service/src/main/scala/org/apache/amber/compiler/model/LogicalPlanPojo.scala
rename to
workflow-compiling-service/src/main/scala/org/apache/amber/compiler/model/LogicalPlanPojo.scala
diff --git
a/core/workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingService.scala
b/workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingService.scala
similarity index 94%
rename from
core/workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingService.scala
rename to
workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingService.scala
index 473f3f0a3d..0763a51420 100644
---
a/core/workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingService.scala
+++
b/workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingService.scala
@@ -24,10 +24,11 @@ import io.dropwizard.core.Application
import io.dropwizard.core.setup.{Bootstrap, Environment}
import org.apache.amber.config.StorageConfig
import org.apache.amber.util.ObjectMapperUtils
-import org.apache.amber.util.PathUtils.workflowCompilingServicePath
import org.apache.texera.dao.SqlServer
import org.apache.texera.service.resource.{HealthCheckResource,
WorkflowCompilationResource}
+import java.nio.file.Path
+
class WorkflowCompilingService extends
Application[WorkflowCompilingServiceConfiguration] {
override def initialize(bootstrap:
Bootstrap[WorkflowCompilingServiceConfiguration]): Unit = {
// register scala module to dropwizard default object mapper
@@ -59,7 +60,9 @@ class WorkflowCompilingService extends
Application[WorkflowCompilingServiceConfi
object WorkflowCompilingService {
def main(args: Array[String]): Unit = {
// set the configuration file's path
- val configFilePath = workflowCompilingServicePath
+ val configFilePath = Path
+ .of(sys.env.getOrElse("TEXERA_HOME", "."))
+ .resolve("workflow-compiling-service")
.resolve("src")
.resolve("main")
.resolve("resources")
diff --git
a/core/workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingServiceConfiguration.scala
b/workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingServiceConfiguration.scala
similarity index 100%
rename from
core/workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingServiceConfiguration.scala
rename to
workflow-compiling-service/src/main/scala/org/apache/texera/service/WorkflowCompilingServiceConfiguration.scala
diff --git
a/core/workflow-compiling-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
b/workflow-compiling-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
similarity index 100%
rename from
core/workflow-compiling-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
rename to
workflow-compiling-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
diff --git
a/core/workflow-compiling-service/src/main/scala/org/apache/texera/service/resource/WorkflowCompilationResource.scala
b/workflow-compiling-service/src/main/scala/org/apache/texera/service/resource/WorkflowCompilationResource.scala
similarity index 100%
rename from
core/workflow-compiling-service/src/main/scala/org/apache/texera/service/resource/WorkflowCompilationResource.scala
rename to
workflow-compiling-service/src/main/scala/org/apache/texera/service/resource/WorkflowCompilationResource.scala
diff --git
a/core/workflow-compiling-service/src/test/resources/country_sales_small.csv
b/workflow-compiling-service/src/test/resources/country_sales_small.csv
similarity index 100%
rename from
core/workflow-compiling-service/src/test/resources/country_sales_small.csv
rename to workflow-compiling-service/src/test/resources/country_sales_small.csv
diff --git
a/core/workflow-compiling-service/src/test/scala/org/apache/texera/service/resource/WorkflowCompilationResourceSpec.scala
b/workflow-compiling-service/src/test/scala/org/apache/texera/service/resource/WorkflowCompilationResourceSpec.scala
similarity index 98%
rename from
core/workflow-compiling-service/src/test/scala/org/apache/texera/service/resource/WorkflowCompilationResourceSpec.scala
rename to
workflow-compiling-service/src/test/scala/org/apache/texera/service/resource/WorkflowCompilationResourceSpec.scala
index 4a169900cd..b603ac2574 100644
---
a/core/workflow-compiling-service/src/test/scala/org/apache/texera/service/resource/WorkflowCompilationResourceSpec.scala
+++
b/workflow-compiling-service/src/test/scala/org/apache/texera/service/resource/WorkflowCompilationResourceSpec.scala
@@ -130,7 +130,7 @@ class WorkflowCompilationResourceSpec extends AnyFlatSpec
with BeforeAndAfterAll
it should "compile workflow successfully with multiple filter and limit
operations" in {
// construct the LogicalPlan: CSVScan --> Projection --> Limit --> Filter
(TotalProfit > 10000) --> Filter (Region != "JPN") --> Limit
val localCsvFilePath =
-
"core/workflow-compiling-service/src/test/resources/country_sales_small.csv"
+ "workflow-compiling-service/src/test/resources/country_sales_small.csv"
val csvSourceOp = getCsvScanOpDesc(localCsvFilePath, header = true)
val projectionOpDesc = getProjectionOpDesc(List("Region", "Total Profit"))
val limitOpDesc1 = getLimitOpDesc(10)
