You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@texera.apache.org by yi...@apache.org on 2025/10/12 06:55:38 UTC

(texera) 01/02: fix: relocate file-service

This is an automated email from the ASF dual-hosted git repository.

yiconghuang pushed a commit to branch chore/relocate-file-service
in repository https://gitbox.apache.org/repos/asf/texera.git

commit f0e98bad20ed3e20a192d8d200a8c47f317d9279
Author: Yicong Huang <17...@users.noreply.github.com>
AuthorDate: Sat Oct 11 23:48:51 2025 -0700

    fix: relocate file-service
---
 build.sbt                                                               | 2 +-
 {core/file-service => file-service}/build.sbt                           | 0
 .../file-service => file-service}/src/main/resources/docker-compose.yml | 0
 .../src/main/resources/file-service-web-config.yaml                     | 0
 {core/file-service => file-service}/src/main/resources/minio-config.yml | 0
 .../src/main/scala/org/apache/texera/service/FileService.scala          | 0
 .../main/scala/org/apache/texera/service/FileServiceConfiguration.scala | 0
 .../org/apache/texera/service/resource/DatasetAccessResource.scala      | 0
 .../main/scala/org/apache/texera/service/resource/DatasetResource.scala | 0
 .../scala/org/apache/texera/service/resource/HealthCheckResource.scala  | 0
 .../scala/org/apache/texera/service/type/dataset/DatasetFileNode.scala  | 0
 .../org/apache/texera/service/type/serde/DatasetFileNodeSerializer.java | 0
 .../src/main/scala/org/apache/texera/service/util/S3StorageClient.scala | 0
 .../src/test/scala/org/apache/texera/service/MockLakeFS.scala           | 0
 .../scala/org/apache/texera/service/resource/DatasetResourceSpec.scala  | 0
 15 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index 38dafbf168..ba83094dc8 100644
--- a/build.sbt
+++ b/build.sbt
@@ -49,7 +49,7 @@ lazy val ComputingUnitManagingService = (project in file("computing-unit-managin
       "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.17.0"
     )
   )
-lazy val FileService = (project in file("core/file-service"))
+lazy val FileService = (project in file("file-service"))
   .dependsOn(WorkflowCore, Auth, Config)
   .configs(Test)
   .dependsOn(DAO % "test->test") // test scope dependency
diff --git a/core/file-service/build.sbt b/file-service/build.sbt
similarity index 100%
rename from core/file-service/build.sbt
rename to file-service/build.sbt
diff --git a/core/file-service/src/main/resources/docker-compose.yml b/file-service/src/main/resources/docker-compose.yml
similarity index 100%
rename from core/file-service/src/main/resources/docker-compose.yml
rename to file-service/src/main/resources/docker-compose.yml
diff --git a/core/file-service/src/main/resources/file-service-web-config.yaml b/file-service/src/main/resources/file-service-web-config.yaml
similarity index 100%
rename from core/file-service/src/main/resources/file-service-web-config.yaml
rename to file-service/src/main/resources/file-service-web-config.yaml
diff --git a/core/file-service/src/main/resources/minio-config.yml b/file-service/src/main/resources/minio-config.yml
similarity index 100%
rename from core/file-service/src/main/resources/minio-config.yml
rename to file-service/src/main/resources/minio-config.yml
diff --git a/core/file-service/src/main/scala/org/apache/texera/service/FileService.scala b/file-service/src/main/scala/org/apache/texera/service/FileService.scala
similarity index 100%
rename from core/file-service/src/main/scala/org/apache/texera/service/FileService.scala
rename to file-service/src/main/scala/org/apache/texera/service/FileService.scala
diff --git a/core/file-service/src/main/scala/org/apache/texera/service/FileServiceConfiguration.scala b/file-service/src/main/scala/org/apache/texera/service/FileServiceConfiguration.scala
similarity index 100%
rename from core/file-service/src/main/scala/org/apache/texera/service/FileServiceConfiguration.scala
rename to file-service/src/main/scala/org/apache/texera/service/FileServiceConfiguration.scala
diff --git a/core/file-service/src/main/scala/org/apache/texera/service/resource/DatasetAccessResource.scala b/file-service/src/main/scala/org/apache/texera/service/resource/DatasetAccessResource.scala
similarity index 100%
rename from core/file-service/src/main/scala/org/apache/texera/service/resource/DatasetAccessResource.scala
rename to file-service/src/main/scala/org/apache/texera/service/resource/DatasetAccessResource.scala
diff --git a/core/file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala b/file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala
similarity index 100%
rename from core/file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala
rename to file-service/src/main/scala/org/apache/texera/service/resource/DatasetResource.scala
diff --git a/core/file-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala b/file-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
similarity index 100%
rename from core/file-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
rename to file-service/src/main/scala/org/apache/texera/service/resource/HealthCheckResource.scala
diff --git a/core/file-service/src/main/scala/org/apache/texera/service/type/dataset/DatasetFileNode.scala b/file-service/src/main/scala/org/apache/texera/service/type/dataset/DatasetFileNode.scala
similarity index 100%
rename from core/file-service/src/main/scala/org/apache/texera/service/type/dataset/DatasetFileNode.scala
rename to file-service/src/main/scala/org/apache/texera/service/type/dataset/DatasetFileNode.scala
diff --git a/core/file-service/src/main/scala/org/apache/texera/service/type/serde/DatasetFileNodeSerializer.java b/file-service/src/main/scala/org/apache/texera/service/type/serde/DatasetFileNodeSerializer.java
similarity index 100%
rename from core/file-service/src/main/scala/org/apache/texera/service/type/serde/DatasetFileNodeSerializer.java
rename to file-service/src/main/scala/org/apache/texera/service/type/serde/DatasetFileNodeSerializer.java
diff --git a/core/file-service/src/main/scala/org/apache/texera/service/util/S3StorageClient.scala b/file-service/src/main/scala/org/apache/texera/service/util/S3StorageClient.scala
similarity index 100%
rename from core/file-service/src/main/scala/org/apache/texera/service/util/S3StorageClient.scala
rename to file-service/src/main/scala/org/apache/texera/service/util/S3StorageClient.scala
diff --git a/core/file-service/src/test/scala/org/apache/texera/service/MockLakeFS.scala b/file-service/src/test/scala/org/apache/texera/service/MockLakeFS.scala
similarity index 100%
rename from core/file-service/src/test/scala/org/apache/texera/service/MockLakeFS.scala
rename to file-service/src/test/scala/org/apache/texera/service/MockLakeFS.scala
diff --git a/core/file-service/src/test/scala/org/apache/texera/service/resource/DatasetResourceSpec.scala b/file-service/src/test/scala/org/apache/texera/service/resource/DatasetResourceSpec.scala
similarity index 100%
rename from core/file-service/src/test/scala/org/apache/texera/service/resource/DatasetResourceSpec.scala
rename to file-service/src/test/scala/org/apache/texera/service/resource/DatasetResourceSpec.scala