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

xiaozhenliu pushed a commit to branch xiaozhen-region-cost-memo
in repository https://gitbox.apache.org/repos/asf/texera.git

commit d81195fb9e4b162fef59cb536395c2eb160066ab
Merge: 1d563cb723 9b531587df
Author: Xiao-zhen-Liu <[email protected]>
AuthorDate: Wed Aug 13 18:12:11 2025 -0700

    Merge branch 'xiaozhen-resource-allocator-in-cost-estimator' into 
xiaozhen-region-cost-memo

 .../pytexera/udf/examples/generator_operator.py    |   3 +-
 .../udf/examples/test_generator_operator.py        |   5 +-
 .../texera/web/resource/auth/AuthResource.scala    |   9 +-
 .../web/resource/auth/GoogleAuthResource.scala     |   4 +-
 .../dashboard/admin/user/AdminUserResource.scala   |  39 ++++
 .../texera/web/service/ResultExportService.scala   |   4 +-
 .../scala/edu/uci/ics/texera/auth/JwtAuth.scala    |   8 +-
 .../edu/uci/ics/texera/auth/JwtAuthFilter.scala    |  15 +-
 .../resource/ComputingUnitManagingResource.scala   |   4 +-
 core/config/src/main/resources/auth.conf           |   3 -
 .../edu/uci/ics/texera/config/AuthConfig.scala     |   3 -
 .../uci/ics/texera/dao/jooq/generated/Keys.java    |   4 +
 .../uci/ics/texera/dao/jooq/generated/Tables.java  |   6 +
 .../ics/texera/dao/jooq/generated/TexeraDb.java    |   7 +
 .../texera/dao/jooq/generated/tables/TimeLog.java  | 172 ++++++++++++++++++
 .../dao/jooq/generated/tables/daos/TimeLogDao.java | 103 +++++++++++
 .../jooq/generated/tables/interfaces/ITimeLog.java |  69 ++++++++
 .../dao/jooq/generated/tables/pojos/TimeLog.java   | 113 ++++++++++++
 .../generated/tables/records/TimeLogRecord.java    | 196 +++++++++++++++++++++
 .../texera/service/resource/DatasetResource.scala  | 114 +++++++++---
 .../ics/texera/service/util/S3StorageClient.scala  |  67 ++++++-
 core/gui/src/app/app-routing.constant.ts           |   2 +-
 core/gui/src/app/app-routing.module.ts             |   8 +-
 .../src/app/common/service/user/auth.service.ts    |   2 +-
 core/gui/src/app/common/type/user.ts               |   1 +
 .../admin/execution/admin-execution.component.html |   2 +-
 .../component/admin/user/admin-user.component.html |   4 +-
 .../component/admin/user/admin-user.component.scss |  12 ++
 .../component/admin/user/admin-user.component.ts   |  11 ++
 .../app/dashboard/component/dashboard.component.ts |   8 +-
 .../dataset-detail.component.html                  |  30 +++-
 .../dataset-detail.component.scss                  |  21 ++-
 .../dataset-detail.component.ts                    |  74 ++++----
 .../service/admin/user/admin-user.service.ts       |   2 +-
 .../service/user/dataset/dataset.service.ts        | 104 +++++++----
 .../service/user/download/download.service.spec.ts |  42 -----
 .../service/user/download/download.service.ts      |  13 +-
 .../detail/hub-workflow-detail.component.html      |  15 +-
 .../context-menu/context-menu.component.html       |  46 ++++-
 .../context-menu/context-menu.component.spec.ts    |  14 +-
 .../context-menu/context-menu.component.ts         |  39 +++-
 .../workflow-editor/workflow-editor.component.ts   |  36 +++-
 core/scripts/sql/texera_ddl.sql                    |   9 +
 core/scripts/sql/updates/10.sql                    |  30 ++++
 .../edu/uci/ics/amber/core/tuple/Attribute.java    |   7 +-
 .../k8s/texera-helmchart/templates/ingress.yaml    |   2 +-
 deployment/k8s/texera-helmchart/values.yaml        |   1 +
 47 files changed, 1261 insertions(+), 222 deletions(-)

Reply via email to