You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@amoro.apache.org by ji...@apache.org on 2024/07/11 09:08:41 UTC
(amoro) 09/10: Merge master & Fix conflicts
This is an automated email from the ASF dual-hosted git repository.
jinsongzhou pushed a commit to branch 0.7.x
in repository https://gitbox.apache.org/repos/asf/amoro.git
commit cdc260277650028f4e75b4b72d6dec5f2142da11
Merge: 4d4611ce9 dcfbc364a
Author: zhoujinsong <zh...@163.com>
AuthorDate: Thu Jul 11 11:02:02 2024 +0800
Merge master & Fix conflicts
.github/workflows/core-hadoop2-ci.yml | 2 +-
.github/workflows/docker-images.yml | 7 +-
.github/workflows/trino-ci.yml | 4 +-
README.md | 5 +-
amoro-ams/amoro-ams-dashboard/README.md | 2 +-
amoro-ams/amoro-ams-dashboard/package.json | 3 +
amoro-ams/amoro-ams-dashboard/pom.xml | 2 +-
amoro-ams/amoro-ams-dashboard/src/App.vue | 6 +-
.../amoro-ams-dashboard/src/components/Sidebar.vue | 2 +-
.../amoro-ams-dashboard/src/components/Topbar.vue | 134 +++++++++++----------
amoro-ams/amoro-ams-dashboard/src/language/en.ts | 12 ++
amoro-ams/amoro-ams-dashboard/src/language/zh.ts | 16 ++-
.../src/services/optimize.service.ts | 6 +-
.../src/views/catalogs/Detail.vue | 39 ++++--
.../src/views/hive-details/components/ErrorMsg.vue | 6 +-
.../src/views/hive-details/index.vue | 2 +-
.../src/views/hive-details/upgrade.vue | 4 +-
.../src/views/optimize/components/List.vue | 21 +++-
.../src/views/optimize/components/ScaleOut.vue | 9 +-
.../src/views/optimize/index.vue | 1 -
.../src/views/resource/components/GroupModal.vue | 9 +-
.../src/views/resource/components/List.vue | 3 -
.../src/views/tables/components/Details.vue | 6 +-
.../src/views/tables/components/Operations.vue | 10 +-
.../src/views/tables/components/Optimizing.vue | 3 -
.../src/views/tables/components/Selector.vue | 8 +-
.../amoro-ams-dashboard/src/views/tables/index.vue | 29 +++--
.../src/views/terminal/components/sql-result.vue | 6 +-
.../src/views/terminal/index.vue | 37 +++---
.../amoro/optimizer/common/OptimizerExecutor.java | 3 +-
.../amoro-optimizer-spark/pom.xml | 11 ++
.../optimizer/spark/SparkOptimizerExecutor.java | 8 +-
amoro-ams/amoro-ams-server/pom.xml | 40 +++---
.../amoro/server/TableManagementService.java | 24 ++--
.../amoro/server/catalog/CatalogService.java | 8 ++
.../amoro/server/catalog/InternalCatalog.java | 4 +
.../dashboard/MixedAndIcebergTableDescriptor.java | 24 ++++
.../server/dashboard/PaimonTableDescriptor.java | 1 +
.../dashboard/controller/CatalogController.java | 5 +-
.../dashboard/controller/OptimizerController.java | 11 +-
.../dashboard/controller/TableController.java | 19 ++-
.../amoro/server/optimizing/OptimizingQueue.java | 2 +-
.../optimizing/plan/CommonPartitionEvaluator.java | 4 +-
.../amoro/server/table/DefaultTableService.java | 126 +++++--------------
.../apache/amoro/server/table/TableService.java | 58 ---------
.../server/terminal/local/LocalSessionFactory.java | 10 +-
.../org/apache/amoro/server/AmsEnvironment.java | 4 +-
.../amoro/server/RestCatalogServiceTestBase.java | 7 +-
.../server/TestInternalMixedCatalogService.java | 3 +-
.../amoro/server/table/AMSTableTestBase.java | 14 ++-
.../amoro/server/table/TestCatalogService.java | 7 +-
.../amoro/server/table/TestDatabaseService.java | 39 +++---
.../amoro/server/table/TestTableService.java | 50 +++++---
amoro-ams/dist/pom.xml | 5 -
amoro-core/pom.xml | 20 +--
.../apache/amoro/io/AuthenticatedHadoopFileIO.java | 1 -
.../apache/amoro/io/reader/StructLikeFunnel.java | 8 +-
.../org/apache/amoro/table/TableMetaStore.java | 10 +-
.../org/apache/amoro/utils/SerializationUtil.java | 22 +---
.../org/apache/amoro/flink/table/FlinkSource.java | 40 +++++-
.../org/apache/amoro/flink/table/TestUnkeyed.java | 65 ++++++++--
.../amoro-mixed-format-trino/pom.xml | 2 +-
docs/admin-guides/managing-optimizers.md | 8 +-
pom.xml | 36 ++++--
tools/releasing/create_binary_release.sh | 2 +-
65 files changed, 616 insertions(+), 479 deletions(-)
diff --cc amoro-ams/amoro-ams-dashboard/src/language/zh.ts
index 50780b2ee,23cdeee18..0afce76de
--- a/amoro-ams/amoro-ams-dashboard/src/language/zh.ts
+++ b/amoro-ams/amoro-ams-dashboard/src/language/zh.ts
@@@ -200,6 -201,16 +201,17 @@@ export default
nothingToShow: '无内容可展示',
filterBranchesOrTags: '过滤分支/标签',
findATag: '查找标签',
- fileSearchPlaceholder: '过滤分区'
+ fileSearchPlaceholder: '过滤分区',
+ noResourceGroupsTitle: '没有任何优化组',
+ noResourceGroupsContent: '需要首先创建一个默认优化组',
+ goToButtonText: '前往',
+ snapshots: '快照',
+ details: '详情',
+ operations: '操作',
+ Running: '运行中',
+ Canceled: '已取消',
+ Failed: '已失败',
+ Finished: '已结束',
+ Created: '已创建',
}
+