This is an automated email from the ASF dual-hosted git repository. yiconghuang pushed a commit to branch chore/rename-core-scripts-to-bin in repository https://gitbox.apache.org/repos/asf/texera.git
commit 086ea8dc5ffb7fc77f0ce7fd7f784813005cfcc9 Author: Yicong Huang <[email protected]> AuthorDate: Sun Oct 12 09:52:13 2025 -0700 chore: rename `core/scripts` to `bin` --- .github/labeler.yml | 3 +-- .github/workflows/github-action-build.yml | 10 +++++----- {core/scripts => bin}/.htaccess | 0 {core/scripts => bin}/add-computing-unit-worker.sh | 0 {core/scripts => bin}/build-services.sh | 0 {core/scripts => bin}/build.sh | 0 {core/scripts => bin}/computing-unit-managing-service.sh | 0 {core/scripts => bin}/config-service.sh | 0 {core/scripts => bin}/config.php | 0 {core/scripts => bin}/cron-restart-crashed-worker.sh | 0 {core/scripts => bin}/deploy-daemon.sh | 0 {core/scripts => bin}/deploy-docker.sh | 0 {core/scripts => bin}/file-service.sh | 0 {core/scripts => bin}/forum/flarum.sql | 0 {core/scripts => bin}/forum/macos-install.sh | 0 {core/scripts => bin}/forum/start-flarum.sh | 0 {core/scripts => bin}/forum/ubuntu-install.sh | 0 {core/scripts => bin}/gui-dev.sh | 0 {core/scripts => bin}/gui-proto-gen.sh | 0 {core/scripts => bin}/gui.sh | 0 {core/scripts => bin}/install-nltk.sh | 0 {core/scripts => bin}/python-language-service.sh | 0 {core/scripts => bin}/python-proto-gen.sh | 0 {core/scripts => bin}/server.sh | 0 {core/scripts => bin}/shared-editing-server.sh | 0 {core/scripts => bin}/sql/iceberg_postgres_catalog.sql | 0 {core/scripts => bin}/sql/misc/tweets.sql | 0 {core/scripts => bin}/sql/texera_ddl.sql | 0 {core/scripts => bin}/sql/texera_lakefs.sql | 0 {core/scripts => bin}/sql/updates/01.sql | 0 {core/scripts => bin}/sql/updates/02.sql | 0 {core/scripts => bin}/sql/updates/03.sql | 0 {core/scripts => bin}/sql/updates/04.sql | 0 {core/scripts => bin}/sql/updates/05.sql | 0 {core/scripts => bin}/sql/updates/06.sql | 0 {core/scripts => bin}/sql/updates/07.sql | 0 {core/scripts => bin}/sql/updates/08.sql | 0 {core/scripts => bin}/sql/updates/09.sql | 0 {core/scripts => bin}/sql/updates/10.sql | 0 {core/scripts => bin}/sql/updates/11.sql | 0 {core/scripts => bin}/sql/updates/12.sql | 0 {core/scripts => bin}/sql/updates/13.sql | 0 {core/scripts => bin}/sql/updates/14.sql | 0 {core/scripts => bin}/sql/updates/15.sql | 0 {core/scripts => bin}/terminate-daemon.sh | 0 {core/scripts => bin}/workflow-compiling-service.sh | 0 {core/scripts => bin}/workflow-computing-unit.sh | 0 .../org/apache/texera/web/resource/UserConfigResource.scala | 2 +- .../texera/web/resource/dashboard/UnifiedResourceSchema.scala | 2 +- .../web/resource/dashboard/user/project/ProjectResource.scala | 2 +- .../resource/dashboard/user/workflow/WorkflowResource.scala | 2 +- .../dashboard/user/workflow/WorkflowVersionResource.scala | 2 +- .../src/test/scala/org/apache/texera/dao/MockTexeraDB.scala | 2 +- deployment/single-node/docker-compose.yml | 2 +- frontend/src/app/dashboard/type/dashboard-file.interface.ts | 2 +- 55 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index f6447656e4..2d14f53154 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -26,7 +26,6 @@ backend: - 'core/**' - all-globs-to-all-files: - '!core/log/**' - - '!core/scripts/**' service: - changed-files: - any-glob-to-any-file: @@ -59,7 +58,7 @@ ci: build: - changed-files: - any-glob-to-any-file: - - 'core/scripts/**' + - 'bin/**' - 'deployment/**' dependencies: diff --git a/.github/workflows/github-action-build.yml b/.github/workflows/github-action-build.yml index d838b94d28..febe39e5b9 100644 --- a/.github/workflows/github-action-build.yml +++ b/.github/workflows/github-action-build.yml @@ -110,13 +110,13 @@ jobs: run: sbt scalafmtCheckAll - name: Create Databases run: | - psql -h localhost -U postgres -f core/scripts/sql/texera_ddl.sql - psql -h localhost -U postgres -f core/scripts/sql/iceberg_postgres_catalog.sql - psql -h localhost -U postgres -f core/scripts/sql/texera_lakefs.sql + psql -h localhost -U postgres -f bin/sql/texera_ddl.sql + psql -h localhost -U postgres -f bin/sql/iceberg_postgres_catalog.sql + psql -h localhost -U postgres -f bin/sql/texera_lakefs.sql env: PGPASSWORD: postgres - name: Create texera_db_for_test_cases - run: psql -h localhost -U postgres -v DB_NAME=texera_db_for_test_cases -f core/scripts/sql/texera_ddl.sql + run: psql -h localhost -U postgres -v DB_NAME=texera_db_for_test_cases -f bin/sql/texera_ddl.sql env: PGPASSWORD: postgres - name: Compile with sbt @@ -148,7 +148,7 @@ jobs: run: sudo systemctl start postgresql - name: Create Database and User run: | - cd core/scripts/sql && sudo -u postgres psql -f iceberg_postgres_catalog.sql + cd bin/sql && sudo -u postgres psql -f iceberg_postgres_catalog.sql - name: Lint with flake8 and black run: | cd core/amber/src/main/python && flake8 && black . --check diff --git a/core/scripts/.htaccess b/bin/.htaccess similarity index 100% rename from core/scripts/.htaccess rename to bin/.htaccess diff --git a/core/scripts/add-computing-unit-worker.sh b/bin/add-computing-unit-worker.sh similarity index 100% rename from core/scripts/add-computing-unit-worker.sh rename to bin/add-computing-unit-worker.sh diff --git a/core/scripts/build-services.sh b/bin/build-services.sh similarity index 100% rename from core/scripts/build-services.sh rename to bin/build-services.sh diff --git a/core/scripts/build.sh b/bin/build.sh similarity index 100% rename from core/scripts/build.sh rename to bin/build.sh diff --git a/core/scripts/computing-unit-managing-service.sh b/bin/computing-unit-managing-service.sh similarity index 100% rename from core/scripts/computing-unit-managing-service.sh rename to bin/computing-unit-managing-service.sh diff --git a/core/scripts/config-service.sh b/bin/config-service.sh similarity index 100% rename from core/scripts/config-service.sh rename to bin/config-service.sh diff --git a/core/scripts/config.php b/bin/config.php similarity index 100% rename from core/scripts/config.php rename to bin/config.php diff --git a/core/scripts/cron-restart-crashed-worker.sh b/bin/cron-restart-crashed-worker.sh similarity index 100% rename from core/scripts/cron-restart-crashed-worker.sh rename to bin/cron-restart-crashed-worker.sh diff --git a/core/scripts/deploy-daemon.sh b/bin/deploy-daemon.sh similarity index 100% rename from core/scripts/deploy-daemon.sh rename to bin/deploy-daemon.sh diff --git a/core/scripts/deploy-docker.sh b/bin/deploy-docker.sh similarity index 100% rename from core/scripts/deploy-docker.sh rename to bin/deploy-docker.sh diff --git a/core/scripts/file-service.sh b/bin/file-service.sh similarity index 100% rename from core/scripts/file-service.sh rename to bin/file-service.sh diff --git a/core/scripts/forum/flarum.sql b/bin/forum/flarum.sql similarity index 100% rename from core/scripts/forum/flarum.sql rename to bin/forum/flarum.sql diff --git a/core/scripts/forum/macos-install.sh b/bin/forum/macos-install.sh similarity index 100% rename from core/scripts/forum/macos-install.sh rename to bin/forum/macos-install.sh diff --git a/core/scripts/forum/start-flarum.sh b/bin/forum/start-flarum.sh similarity index 100% rename from core/scripts/forum/start-flarum.sh rename to bin/forum/start-flarum.sh diff --git a/core/scripts/forum/ubuntu-install.sh b/bin/forum/ubuntu-install.sh similarity index 100% rename from core/scripts/forum/ubuntu-install.sh rename to bin/forum/ubuntu-install.sh diff --git a/core/scripts/gui-dev.sh b/bin/gui-dev.sh similarity index 100% rename from core/scripts/gui-dev.sh rename to bin/gui-dev.sh diff --git a/core/scripts/gui-proto-gen.sh b/bin/gui-proto-gen.sh similarity index 100% rename from core/scripts/gui-proto-gen.sh rename to bin/gui-proto-gen.sh diff --git a/core/scripts/gui.sh b/bin/gui.sh similarity index 100% rename from core/scripts/gui.sh rename to bin/gui.sh diff --git a/core/scripts/install-nltk.sh b/bin/install-nltk.sh similarity index 100% rename from core/scripts/install-nltk.sh rename to bin/install-nltk.sh diff --git a/core/scripts/python-language-service.sh b/bin/python-language-service.sh similarity index 100% rename from core/scripts/python-language-service.sh rename to bin/python-language-service.sh diff --git a/core/scripts/python-proto-gen.sh b/bin/python-proto-gen.sh similarity index 100% rename from core/scripts/python-proto-gen.sh rename to bin/python-proto-gen.sh diff --git a/core/scripts/server.sh b/bin/server.sh similarity index 100% rename from core/scripts/server.sh rename to bin/server.sh diff --git a/core/scripts/shared-editing-server.sh b/bin/shared-editing-server.sh similarity index 100% rename from core/scripts/shared-editing-server.sh rename to bin/shared-editing-server.sh diff --git a/core/scripts/sql/iceberg_postgres_catalog.sql b/bin/sql/iceberg_postgres_catalog.sql similarity index 100% rename from core/scripts/sql/iceberg_postgres_catalog.sql rename to bin/sql/iceberg_postgres_catalog.sql diff --git a/core/scripts/sql/misc/tweets.sql b/bin/sql/misc/tweets.sql similarity index 100% rename from core/scripts/sql/misc/tweets.sql rename to bin/sql/misc/tweets.sql diff --git a/core/scripts/sql/texera_ddl.sql b/bin/sql/texera_ddl.sql similarity index 100% rename from core/scripts/sql/texera_ddl.sql rename to bin/sql/texera_ddl.sql diff --git a/core/scripts/sql/texera_lakefs.sql b/bin/sql/texera_lakefs.sql similarity index 100% rename from core/scripts/sql/texera_lakefs.sql rename to bin/sql/texera_lakefs.sql diff --git a/core/scripts/sql/updates/01.sql b/bin/sql/updates/01.sql similarity index 100% rename from core/scripts/sql/updates/01.sql rename to bin/sql/updates/01.sql diff --git a/core/scripts/sql/updates/02.sql b/bin/sql/updates/02.sql similarity index 100% rename from core/scripts/sql/updates/02.sql rename to bin/sql/updates/02.sql diff --git a/core/scripts/sql/updates/03.sql b/bin/sql/updates/03.sql similarity index 100% rename from core/scripts/sql/updates/03.sql rename to bin/sql/updates/03.sql diff --git a/core/scripts/sql/updates/04.sql b/bin/sql/updates/04.sql similarity index 100% rename from core/scripts/sql/updates/04.sql rename to bin/sql/updates/04.sql diff --git a/core/scripts/sql/updates/05.sql b/bin/sql/updates/05.sql similarity index 100% rename from core/scripts/sql/updates/05.sql rename to bin/sql/updates/05.sql diff --git a/core/scripts/sql/updates/06.sql b/bin/sql/updates/06.sql similarity index 100% rename from core/scripts/sql/updates/06.sql rename to bin/sql/updates/06.sql diff --git a/core/scripts/sql/updates/07.sql b/bin/sql/updates/07.sql similarity index 100% rename from core/scripts/sql/updates/07.sql rename to bin/sql/updates/07.sql diff --git a/core/scripts/sql/updates/08.sql b/bin/sql/updates/08.sql similarity index 100% rename from core/scripts/sql/updates/08.sql rename to bin/sql/updates/08.sql diff --git a/core/scripts/sql/updates/09.sql b/bin/sql/updates/09.sql similarity index 100% rename from core/scripts/sql/updates/09.sql rename to bin/sql/updates/09.sql diff --git a/core/scripts/sql/updates/10.sql b/bin/sql/updates/10.sql similarity index 100% rename from core/scripts/sql/updates/10.sql rename to bin/sql/updates/10.sql diff --git a/core/scripts/sql/updates/11.sql b/bin/sql/updates/11.sql similarity index 100% rename from core/scripts/sql/updates/11.sql rename to bin/sql/updates/11.sql diff --git a/core/scripts/sql/updates/12.sql b/bin/sql/updates/12.sql similarity index 100% rename from core/scripts/sql/updates/12.sql rename to bin/sql/updates/12.sql diff --git a/core/scripts/sql/updates/13.sql b/bin/sql/updates/13.sql similarity index 100% rename from core/scripts/sql/updates/13.sql rename to bin/sql/updates/13.sql diff --git a/core/scripts/sql/updates/14.sql b/bin/sql/updates/14.sql similarity index 100% rename from core/scripts/sql/updates/14.sql rename to bin/sql/updates/14.sql diff --git a/core/scripts/sql/updates/15.sql b/bin/sql/updates/15.sql similarity index 100% rename from core/scripts/sql/updates/15.sql rename to bin/sql/updates/15.sql diff --git a/core/scripts/terminate-daemon.sh b/bin/terminate-daemon.sh similarity index 100% rename from core/scripts/terminate-daemon.sh rename to bin/terminate-daemon.sh diff --git a/core/scripts/workflow-compiling-service.sh b/bin/workflow-compiling-service.sh similarity index 100% rename from core/scripts/workflow-compiling-service.sh rename to bin/workflow-compiling-service.sh diff --git a/core/scripts/workflow-computing-unit.sh b/bin/workflow-computing-unit.sh similarity index 100% rename from core/scripts/workflow-computing-unit.sh rename to bin/workflow-computing-unit.sh diff --git a/core/amber/src/main/scala/org/apache/texera/web/resource/UserConfigResource.scala b/core/amber/src/main/scala/org/apache/texera/web/resource/UserConfigResource.scala index 6eba80f4af..609c6a2cf1 100644 --- a/core/amber/src/main/scala/org/apache/texera/web/resource/UserConfigResource.scala +++ b/core/amber/src/main/scala/org/apache/texera/web/resource/UserConfigResource.scala @@ -35,7 +35,7 @@ import scala.jdk.CollectionConverters.CollectionHasAsScala * This class handles requests to read and write the user dictionary, * an abstract collection of (key, value) string pairs that is unique for each user * This is accomplished using a mysql table called user_dictionary. - * The details of user_dictionary can be found in /core/scripts/sql/texera_ddl.sql + * The details of user_dictionary can be found in /bin/sql/texera_ddl.sql */ @Path("/user/config") @RolesAllowed(Array("REGULAR", "ADMIN")) diff --git a/core/amber/src/main/scala/org/apache/texera/web/resource/dashboard/UnifiedResourceSchema.scala b/core/amber/src/main/scala/org/apache/texera/web/resource/dashboard/UnifiedResourceSchema.scala index 12d073c653..4162375b26 100644 --- a/core/amber/src/main/scala/org/apache/texera/web/resource/dashboard/UnifiedResourceSchema.scala +++ b/core/amber/src/main/scala/org/apache/texera/web/resource/dashboard/UnifiedResourceSchema.scala @@ -102,7 +102,7 @@ object UnifiedResourceSchema { } /** - * Refer to texera/core/scripts/sql/texera_ddl.sql to understand what each attribute is + * Refer to texera/bin/sql/texera_ddl.sql to understand what each attribute is * * Attributes common across all resource types: * - `resourceType`: The type of the resource (e.g., project, workflow, file) as a `String`. diff --git a/core/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/ProjectResource.scala b/core/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/ProjectResource.scala index 3b0561f2e5..9129bcbec1 100644 --- a/core/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/ProjectResource.scala +++ b/core/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/project/ProjectResource.scala @@ -48,7 +48,7 @@ import scala.jdk.CollectionConverters.IterableHasAsScala * This file handles various request related to projects. * It sends mysql queries to the MysqlDB regarding the 'user_project', * 'workflow_of_project', and 'file_of_project' Tables - * The details of these tables can be found in /core/scripts/sql/texera_ddl.sql + * The details of these tables can be found in /bin/sql/texera_ddl.sql */ object ProjectResource { diff --git a/core/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala b/core/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala index 1cc2c3c8e8..64234f4892 100644 --- a/core/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala +++ b/core/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowResource.scala @@ -57,7 +57,7 @@ import scala.util.control.NonFatal /** * This file handles various request related to saved-workflows. * It sends mysql queries to the MysqlDB regarding the UserWorkflow Table - * The details of UserWorkflowTable can be found in /core/scripts/sql/texera_ddl.sql + * The details of UserWorkflowTable can be found in /bin/sql/texera_ddl.sql */ object WorkflowResource { diff --git a/core/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala b/core/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala index 453e793ae7..cdf9656f1d 100644 --- a/core/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala +++ b/core/amber/src/main/scala/org/apache/texera/web/resource/dashboard/user/workflow/WorkflowVersionResource.scala @@ -43,7 +43,7 @@ import scala.jdk.CollectionConverters.IterableHasAsScala /** * This file handles various request related to workflows versions. - * The details of the mysql tables can be found in /core/scripts/sql/texera_ddl.sql + * The details of the mysql tables can be found in /bin/sql/texera_ddl.sql */ object WorkflowVersionResource { diff --git a/core/dao/src/test/scala/org/apache/texera/dao/MockTexeraDB.scala b/core/dao/src/test/scala/org/apache/texera/dao/MockTexeraDB.scala index 8f13eebbe2..4c3464ade7 100644 --- a/core/dao/src/test/scala/org/apache/texera/dao/MockTexeraDB.scala +++ b/core/dao/src/test/scala/org/apache/texera/dao/MockTexeraDB.scala @@ -84,7 +84,7 @@ trait MockTexeraDB { dbInstance = Some(embedded) val ddlPath = { - Paths.get("core/scripts/sql/texera_ddl.sql").toRealPath() + Paths.get("bin/sql/texera_ddl.sql").toRealPath() } val source = Source.fromFile(ddlPath.toString) val content = diff --git a/deployment/single-node/docker-compose.yml b/deployment/single-node/docker-compose.yml index bd2394a882..cb6f16bf21 100644 --- a/deployment/single-node/docker-compose.yml +++ b/deployment/single-node/docker-compose.yml @@ -46,7 +46,7 @@ services: volumes: - postgres_data:/var/lib/postgresql/data # mount the sql files for initializing the postgres - - ../../core/scripts/sql:/docker-entrypoint-initdb.d + - ../../bin/sql:/docker-entrypoint-initdb.d # lakeFS is the underlying storage of Texera's dataset service lakefs: diff --git a/frontend/src/app/dashboard/type/dashboard-file.interface.ts b/frontend/src/app/dashboard/type/dashboard-file.interface.ts index 3582d0bd6d..233c9a8c1a 100644 --- a/frontend/src/app/dashboard/type/dashboard-file.interface.ts +++ b/frontend/src/app/dashboard/type/dashboard-file.interface.ts @@ -28,7 +28,7 @@ export interface DashboardFile * This interface stores the information about the users' files. * These information is used to locate the file for the operators. * Corresponds to `src/main/scala/org/apache/texera/web/resource/dashboard/file/UserFileResource.scala` (backend); - * and `core/scripts/sql/texera_ddl.sql`, table `file` (database). + * and `bin/sql/texera_ddl.sql`, table `file` (database). */ export interface UserFile { ownerUid: number;
