From ab1f6e15d5a1a2d3dec3a504bd6c79b983ca979c Mon Sep 17 00:00:00 2001
From: chouchouji <70570907+chouchouji@users.noreply.github.com>
Date: Fri, 5 Jul 2024 11:26:02 +0800
Subject: [PATCH 01/25] WIP [AMORO-3002] Complete internationalization for some
 remaining pages (#3006)

[AMORO-3002] Complete internationalization for some remaining pages
---
 .../src/components/tables-sub-menu/CreateDB.vue      |  9 ++++++++-
 amoro-ams/amoro-ams-dashboard/src/language/en.ts     |  3 +++
 amoro-ams/amoro-ams-dashboard/src/language/zh.ts     |  3 +++
 .../src/views/catalogs/Detail.vue                    |  4 ++++
 .../amoro-ams-dashboard/src/views/catalogs/index.vue |  1 +
 .../src/views/hive-details/components/ErrorMsg.vue   |  4 +++-
 .../src/views/optimize/components/List.vue           |  5 ++---
 .../src/views/optimize/components/ScaleOut.vue       | 11 ++++++++++-
 .../amoro-ams-dashboard/src/views/optimize/index.vue |  1 -
 .../src/views/resource/components/GroupModal.vue     | 11 +++++++++--
 .../src/views/resource/components/List.vue           |  8 +++++---
 .../src/views/resource/components/ScaleOut.vue       |  2 ++
 .../src/views/tables/components/Operations.vue       |  4 +++-
 .../src/views/tables/components/Optimizing.vue       |  5 ++---
 .../amoro-ams-dashboard/src/views/tables/index.vue   | 12 ++++++------
 .../src/views/terminal/components/sql-result.vue     |  5 -----
 16 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/CreateDB.vue b/amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/CreateDB.vue
index 01b414e7dd..648cc024cf 100644
--- a/amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/CreateDB.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/CreateDB.vue
@@ -74,7 +74,14 @@ export default defineComponent({
 </script>
 
 <template>
-  <a-modal v-model:open="$props.visible" :title="$t('createDatabase')" @ok="handleOk" @cancel="handleCancel">
+  <a-modal 
+    v-model:open="$props.visible" 
+    :title="$t('createDatabase')" 
+    :ok-text="$t('ok')"
+    :cancel-text="$t('cancel')" 
+    @ok="handleOk" 
+    @cancel="handleCancel"
+  >
     <a-form ref="formRef" :model="formState" class="label-120">
       <a-form-item name="catalog" :label="$t('catalog')" :rules="[{ required: true, message: `${placeholder.selectClPh}` }]">
         <a-select
diff --git a/amoro-ams/amoro-ams-dashboard/src/language/en.ts b/amoro-ams/amoro-ams-dashboard/src/language/en.ts
index b49d680ac8..0c72edde18 100644
--- a/amoro-ams/amoro-ams-dashboard/src/language/en.ts
+++ b/amoro-ams/amoro-ams-dashboard/src/language/en.ts
@@ -205,4 +205,7 @@ export default {
   noResourceGroupsTitle: 'No resource groups available.',
   noResourceGroupsContent: 'Please create an optimizer group first.',
   goToButtonText: 'Go',
+  snapshots: 'Snapshots',
+  details: 'Details',
+  operations: 'Operations',
 }
diff --git a/amoro-ams/amoro-ams-dashboard/src/language/zh.ts b/amoro-ams/amoro-ams-dashboard/src/language/zh.ts
index d8bb45b155..13ad8cec2e 100644
--- a/amoro-ams/amoro-ams-dashboard/src/language/zh.ts
+++ b/amoro-ams/amoro-ams-dashboard/src/language/zh.ts
@@ -205,4 +205,7 @@ export default {
   noResourceGroupsTitle: '没有任何优化组',
   noResourceGroupsContent: '需要首先创建一个默认优化组',
   goToButtonText: '前往',
+  snapshots: '快照',
+  details: '详情',
+  operations: '操作',
 }
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/catalogs/Detail.vue b/amoro-ams/amoro-ams-dashboard/src/views/catalogs/Detail.vue
index bce5d31748..97ba1c3e29 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/catalogs/Detail.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/catalogs/Detail.vue
@@ -203,6 +203,7 @@ async function getOptimizerGroupList() {
       title: t('noResourceGroupsTitle'),
       content: t('noResourceGroupsContent'),
       okText: t('goToButtonText'),
+      cancelText: t('cancel'),
       onOk: async () => {
         try {
           router.push({ path: '/optimizing', query: { tab: 'optimizergroup' } })
@@ -457,6 +458,7 @@ async function handleRemove() {
     title: t('cannotDeleteModalTitle'),
     content: t('cannotDeleteModalContent'),
     wrapClassName: 'not-delete-modal',
+    okText: t('ok'),
   })
 }
 async function validatorName(_: any, value: string) {
@@ -534,6 +536,8 @@ function handleCancel() {
 async function deleteCatalogModal() {
   Modal.confirm({
     title: t('deleteCatalogModalTitle'),
+    okText: t('ok'),
+    cancelText: t('cancel'),
     onOk: async () => {
       try {
         await delCatalog(formState.catalog.name || '')
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/catalogs/index.vue b/amoro-ams/amoro-ams-dashboard/src/views/catalogs/index.vue
index 15243e5ea5..1e8df87a04 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/catalogs/index.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/catalogs/index.vue
@@ -152,6 +152,7 @@ function leaveConfirm(cb?: () => void) {
     title: t('leavePageModalTitle'),
     content: t('leavePageModalContent'),
     okText: t('leave'),
+    cancelText: t('cancel'),
     onOk: async () => {
       cb && await cb()
     },
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/ErrorMsg.vue b/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/ErrorMsg.vue
index 609dcadd9d..9211308f75 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/ErrorMsg.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/ErrorMsg.vue
@@ -31,8 +31,10 @@ const open = ref(true)
   <AModal
     v-model:open="open"
     :width="560"
-    :title="`${$t('errorMessage')}`"
+    :title="$t('errorMessage')"
     :footer="null"
+    :ok-text="$t('ok')"
+    :cancel-text="$t('cancel')"
     class="upgrade-error"
     @cancel="emit('cancel')"
   >
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/List.vue b/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/List.vue
index 112d67b921..b54830b5d7 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/List.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/List.vue
@@ -110,9 +110,8 @@ function releaseModal(record: any) {
   }
   Modal.confirm({
     title: t('releaseOptModalTitle'),
-    content: '',
-    okText: '',
-    cancelText: '',
+    okText: t('ok'),
+    cancelText: t('cancel'),
     onOk: () => {
       releaseJob(record)
     },
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/ScaleOut.vue b/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/ScaleOut.vue
index 8dc3eff9eb..9d81a240e0 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/ScaleOut.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/ScaleOut.vue
@@ -85,7 +85,16 @@ onMounted(() => {
 </script>
 
 <template>
-  <AModal :visible="props.visible" :title="$t('scaleOut')" :confirm-loading="confirmLoading" :closable="false" @ok="handleOk" @cancel="handleCancel">
+  <AModal 
+    :visible="props.visible" 
+    :title="$t('scaleOut')" 
+    :confirm-loading="confirmLoading" 
+    :closable="false" 
+    :ok-text="$t('ok')"
+    :cancel-text="$t('cancel')"
+    @ok="handleOk" 
+    @cancel="handleCancel"
+  >
     <a-form ref="formRef" :model="formState" class="label-120">
       <a-form-item name="resourceGroup" :label="$t('resourceGroup')" :rules="[{ required: true, message: `${placeholder.resourceGroupPh}` }]">
         <a-select
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/optimize/index.vue b/amoro-ams/amoro-ams-dashboard/src/views/optimize/index.vue
index fbc8faa332..1b017b50f8 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/optimize/index.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/optimize/index.vue
@@ -25,7 +25,6 @@ import type { IGroupItem, IGroupItemInfo, ILableAndValue, IMap } from '@/types/c
 import { usePlaceholder } from '@/hooks/usePlaceholder'
 import { usePagination } from '@/hooks/usePagination'
 import { getOptimizerGroups, getQueueResourceInfo } from '@/services/optimize.service'
-// import ScaleOutModal from './components/ScaleOut.vue'
 import { mbToSize } from '@/utils'
 
 export default defineComponent({
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/resource/components/GroupModal.vue b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/GroupModal.vue
index 19e61789cc..40f8e52166 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/resource/components/GroupModal.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/GroupModal.vue
@@ -109,8 +109,15 @@ onMounted(() => {
 
 <template>
   <AModal
-    :visible="true" :title="edit ? $t('editgroup') : $t('addgroup')" :confirm-loading="confirmLoading"
-    :closable="false" class="group-modal" @ok="handleOk" @cancel="handleCancel"
+    :visible="true" 
+    :title="edit ? $t('editgroup') : $t('addgroup')" 
+    :confirm-loading="confirmLoading"
+    :closable="false"
+    :ok-text="$t('ok')"
+    :cancel-text="$t('cancel')"
+    lass="group-modal" 
+    @ok="handleOk" 
+    @cancel="handleCancel"
   >
     <a-form ref="formRef" :model="formState" class="label-120">
       <a-form-item name="name" :label="$t('name')" :rules="[{ required: true, message: `${placeholder.groupNamePh}` }]">
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/resource/components/List.vue b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/List.vue
index 7c2d42c3e8..6a5923be77 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/resource/components/List.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/List.vue
@@ -96,9 +96,8 @@ function releaseModal(record: any) {
   }
   Modal.confirm({
     title: t('releaseOptModalTitle'),
-    content: '',
-    okText: '',
-    cancelText: '',
+    okText: t('confirm'),
+    cancelText: t('cancel'),
     onOk: () => {
       releaseJob(record)
     },
@@ -174,6 +173,8 @@ async function removeGroup(record: IIOptimizeGroupItem) {
   if (res) {
     Modal.confirm({
       title: t('deleteGroupModalTitle'),
+      okText: t('ok'),
+      cancelText: t('cancel'),
       onOk: async () => {
         await groupDeleteAPI({ name: record.name })
         message.success(`${t('remove')} ${t('success')}`)
@@ -185,6 +186,7 @@ async function removeGroup(record: IIOptimizeGroupItem) {
   Modal.warning({
     title: t('cannotDeleteGroupModalTitle'),
     content: t('cannotDeleteGroupModalContent'),
+    okText: t('ok'),
   })
 }
 
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/resource/components/ScaleOut.vue b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/ScaleOut.vue
index 001d403565..ea1bd33e9b 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/resource/components/ScaleOut.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/ScaleOut.vue
@@ -76,6 +76,8 @@ onMounted(() => {
     :title="$t('scaleOut')"
     :confirm-loading="confirmLoading"
     :closable="false"
+    :ok-text="$t('ok')"
+    :cancel-text="$t('cancel')"
     @ok="handleOk"
     @cancel="handleCancel"
   >
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Operations.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Operations.vue
index c9cd4e7481..52fb98ebc0 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Operations.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Operations.vue
@@ -126,7 +126,9 @@ onMounted(() => {
   <AModal
     :visible="visible"
     :width="560"
-    :title="`${$t('operationDetails')}`"
+    :ok-text="$t('ok')"
+    :cancel-text="$t('cancel')"
+    :title="$t('operationDetails')"
     class="operation-wrap"
     @cancel="cancel"
   >
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Optimizing.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Optimizing.vue
index 7482b4f38d..267722bda5 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Optimizing.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Optimizing.vue
@@ -124,9 +124,8 @@ async function refreshOptimizingProcesses() {
 async function cancel() {
   Modal.confirm({
     title: t('cancelOptimizingProcessOptModalTitle'),
-    content: '',
-    okText: '',
-    cancelText: '',
+    okText: t('ok'),
+    cancelText: t('cancel'),
     onOk: async () => {
       try {
         loading.value = true
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/tables/index.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/index.vue
index 55d9b8c328..fe683eddbe 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/tables/index.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/tables/index.vue
@@ -44,9 +44,9 @@ export default defineComponent({
     const detailRef = ref()
 
     const tabConfigs = shallowReactive([
-      { key: 'Snapshots', label: 'Snapshots' },
-      { key: 'Optimizing', label: 'Optimizing' },
-      { key: 'Operations', label: 'Operations' },
+      { key: 'Snapshots', label: 'snapshots' },
+      { key: 'Optimizing', label: 'optimizing' },
+      { key: 'Operations', label: 'operations' },
     ])
 
     const state = reactive({
@@ -156,13 +156,13 @@ export default defineComponent({
       </div>
       <div class="content">
         <a-tabs v-model:activeKey="activeKey" destroy-inactive-tab-pane @change="onChangeTab">
-          <a-tab-pane key="Details" tab="Details" force-render>
+          <a-tab-pane key="Details" :tab="$t('details')" force-render>
             <UDetails ref="detailRef" @set-base-detail-info="setBaseDetailInfo" />
           </a-tab-pane>
-          <a-tab-pane v-if="detailLoaded" key="Files" tab="Files">
+          <a-tab-pane v-if="detailLoaded" key="Files" :tab="$t('files')">
             <UFiles :has-partition="baseInfo.hasPartition" />
           </a-tab-pane>
-          <a-tab-pane v-for="tab in tabConfigs" :key="tab.key" :tab="`${tab.label}`">
+          <a-tab-pane v-for="tab in tabConfigs" :key="tab.key" :tab="$t(tab.label)">
             <component :is="`U${tab.key}`" />
           </a-tab-pane>
         </a-tabs>
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue b/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue
index 3487484ffe..286996f8f9 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue
@@ -30,14 +30,9 @@ const isEmpty = computed(() => {
 const status = computed(() => {
   return props.info?.status
 })
-
-// const innerWidth = computed(() => {
-//   return window.innerWidth - 220 - 34
-// })
 </script>
 
 <template>
-  <!-- :style="{width: `${innerWidth}px`}" -->
   <div class="sql-result-wrap">
     <div class="result-status" :style="{ background: debugResultBgcMap[status as keyof typeof debugResultBgcMap] }">
       <template v-if="status === 'Running'">

From edc50e6c7e457098c45b182a6c3e1a3f20b1b5b9 Mon Sep 17 00:00:00 2001
From: ZhouJinsong <zhoujinsong0505@163.com>
Date: Fri, 5 Jul 2024 13:14:50 +0800
Subject: [PATCH 02/25] Revert "WIP [AMORO-3002] Complete internationalization
 for some remaining pages" (#3008)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Revert "WIP [AMORO-3002] Complete internationalization for some remaining pag…"

This reverts commit ab1f6e15d5a1a2d3dec3a504bd6c79b983ca979c.
---
 .../src/components/tables-sub-menu/CreateDB.vue      |  9 +--------
 amoro-ams/amoro-ams-dashboard/src/language/en.ts     |  3 ---
 amoro-ams/amoro-ams-dashboard/src/language/zh.ts     |  3 ---
 .../src/views/catalogs/Detail.vue                    |  4 ----
 .../amoro-ams-dashboard/src/views/catalogs/index.vue |  1 -
 .../src/views/hive-details/components/ErrorMsg.vue   |  4 +---
 .../src/views/optimize/components/List.vue           |  5 +++--
 .../src/views/optimize/components/ScaleOut.vue       | 11 +----------
 .../amoro-ams-dashboard/src/views/optimize/index.vue |  1 +
 .../src/views/resource/components/GroupModal.vue     | 11 ++---------
 .../src/views/resource/components/List.vue           |  8 +++-----
 .../src/views/resource/components/ScaleOut.vue       |  2 --
 .../src/views/tables/components/Operations.vue       |  4 +---
 .../src/views/tables/components/Optimizing.vue       |  5 +++--
 .../amoro-ams-dashboard/src/views/tables/index.vue   | 12 ++++++------
 .../src/views/terminal/components/sql-result.vue     |  5 +++++
 16 files changed, 27 insertions(+), 61 deletions(-)

diff --git a/amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/CreateDB.vue b/amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/CreateDB.vue
index 648cc024cf..01b414e7dd 100644
--- a/amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/CreateDB.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/CreateDB.vue
@@ -74,14 +74,7 @@ export default defineComponent({
 </script>
 
 <template>
-  <a-modal 
-    v-model:open="$props.visible" 
-    :title="$t('createDatabase')" 
-    :ok-text="$t('ok')"
-    :cancel-text="$t('cancel')" 
-    @ok="handleOk" 
-    @cancel="handleCancel"
-  >
+  <a-modal v-model:open="$props.visible" :title="$t('createDatabase')" @ok="handleOk" @cancel="handleCancel">
     <a-form ref="formRef" :model="formState" class="label-120">
       <a-form-item name="catalog" :label="$t('catalog')" :rules="[{ required: true, message: `${placeholder.selectClPh}` }]">
         <a-select
diff --git a/amoro-ams/amoro-ams-dashboard/src/language/en.ts b/amoro-ams/amoro-ams-dashboard/src/language/en.ts
index 0c72edde18..b49d680ac8 100644
--- a/amoro-ams/amoro-ams-dashboard/src/language/en.ts
+++ b/amoro-ams/amoro-ams-dashboard/src/language/en.ts
@@ -205,7 +205,4 @@ export default {
   noResourceGroupsTitle: 'No resource groups available.',
   noResourceGroupsContent: 'Please create an optimizer group first.',
   goToButtonText: 'Go',
-  snapshots: 'Snapshots',
-  details: 'Details',
-  operations: 'Operations',
 }
diff --git a/amoro-ams/amoro-ams-dashboard/src/language/zh.ts b/amoro-ams/amoro-ams-dashboard/src/language/zh.ts
index 13ad8cec2e..d8bb45b155 100644
--- a/amoro-ams/amoro-ams-dashboard/src/language/zh.ts
+++ b/amoro-ams/amoro-ams-dashboard/src/language/zh.ts
@@ -205,7 +205,4 @@ export default {
   noResourceGroupsTitle: '没有任何优化组',
   noResourceGroupsContent: '需要首先创建一个默认优化组',
   goToButtonText: '前往',
-  snapshots: '快照',
-  details: '详情',
-  operations: '操作',
 }
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/catalogs/Detail.vue b/amoro-ams/amoro-ams-dashboard/src/views/catalogs/Detail.vue
index 97ba1c3e29..bce5d31748 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/catalogs/Detail.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/catalogs/Detail.vue
@@ -203,7 +203,6 @@ async function getOptimizerGroupList() {
       title: t('noResourceGroupsTitle'),
       content: t('noResourceGroupsContent'),
       okText: t('goToButtonText'),
-      cancelText: t('cancel'),
       onOk: async () => {
         try {
           router.push({ path: '/optimizing', query: { tab: 'optimizergroup' } })
@@ -458,7 +457,6 @@ async function handleRemove() {
     title: t('cannotDeleteModalTitle'),
     content: t('cannotDeleteModalContent'),
     wrapClassName: 'not-delete-modal',
-    okText: t('ok'),
   })
 }
 async function validatorName(_: any, value: string) {
@@ -536,8 +534,6 @@ function handleCancel() {
 async function deleteCatalogModal() {
   Modal.confirm({
     title: t('deleteCatalogModalTitle'),
-    okText: t('ok'),
-    cancelText: t('cancel'),
     onOk: async () => {
       try {
         await delCatalog(formState.catalog.name || '')
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/catalogs/index.vue b/amoro-ams/amoro-ams-dashboard/src/views/catalogs/index.vue
index 1e8df87a04..15243e5ea5 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/catalogs/index.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/catalogs/index.vue
@@ -152,7 +152,6 @@ function leaveConfirm(cb?: () => void) {
     title: t('leavePageModalTitle'),
     content: t('leavePageModalContent'),
     okText: t('leave'),
-    cancelText: t('cancel'),
     onOk: async () => {
       cb && await cb()
     },
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/ErrorMsg.vue b/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/ErrorMsg.vue
index 9211308f75..609dcadd9d 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/ErrorMsg.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/ErrorMsg.vue
@@ -31,10 +31,8 @@ const open = ref(true)
   <AModal
     v-model:open="open"
     :width="560"
-    :title="$t('errorMessage')"
+    :title="`${$t('errorMessage')}`"
     :footer="null"
-    :ok-text="$t('ok')"
-    :cancel-text="$t('cancel')"
     class="upgrade-error"
     @cancel="emit('cancel')"
   >
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/List.vue b/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/List.vue
index b54830b5d7..112d67b921 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/List.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/List.vue
@@ -110,8 +110,9 @@ function releaseModal(record: any) {
   }
   Modal.confirm({
     title: t('releaseOptModalTitle'),
-    okText: t('ok'),
-    cancelText: t('cancel'),
+    content: '',
+    okText: '',
+    cancelText: '',
     onOk: () => {
       releaseJob(record)
     },
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/ScaleOut.vue b/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/ScaleOut.vue
index 9d81a240e0..8dc3eff9eb 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/ScaleOut.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/ScaleOut.vue
@@ -85,16 +85,7 @@ onMounted(() => {
 </script>
 
 <template>
-  <AModal 
-    :visible="props.visible" 
-    :title="$t('scaleOut')" 
-    :confirm-loading="confirmLoading" 
-    :closable="false" 
-    :ok-text="$t('ok')"
-    :cancel-text="$t('cancel')"
-    @ok="handleOk" 
-    @cancel="handleCancel"
-  >
+  <AModal :visible="props.visible" :title="$t('scaleOut')" :confirm-loading="confirmLoading" :closable="false" @ok="handleOk" @cancel="handleCancel">
     <a-form ref="formRef" :model="formState" class="label-120">
       <a-form-item name="resourceGroup" :label="$t('resourceGroup')" :rules="[{ required: true, message: `${placeholder.resourceGroupPh}` }]">
         <a-select
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/optimize/index.vue b/amoro-ams/amoro-ams-dashboard/src/views/optimize/index.vue
index 1b017b50f8..fbc8faa332 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/optimize/index.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/optimize/index.vue
@@ -25,6 +25,7 @@ import type { IGroupItem, IGroupItemInfo, ILableAndValue, IMap } from '@/types/c
 import { usePlaceholder } from '@/hooks/usePlaceholder'
 import { usePagination } from '@/hooks/usePagination'
 import { getOptimizerGroups, getQueueResourceInfo } from '@/services/optimize.service'
+// import ScaleOutModal from './components/ScaleOut.vue'
 import { mbToSize } from '@/utils'
 
 export default defineComponent({
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/resource/components/GroupModal.vue b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/GroupModal.vue
index 40f8e52166..19e61789cc 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/resource/components/GroupModal.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/GroupModal.vue
@@ -109,15 +109,8 @@ onMounted(() => {
 
 <template>
   <AModal
-    :visible="true" 
-    :title="edit ? $t('editgroup') : $t('addgroup')" 
-    :confirm-loading="confirmLoading"
-    :closable="false"
-    :ok-text="$t('ok')"
-    :cancel-text="$t('cancel')"
-    lass="group-modal" 
-    @ok="handleOk" 
-    @cancel="handleCancel"
+    :visible="true" :title="edit ? $t('editgroup') : $t('addgroup')" :confirm-loading="confirmLoading"
+    :closable="false" class="group-modal" @ok="handleOk" @cancel="handleCancel"
   >
     <a-form ref="formRef" :model="formState" class="label-120">
       <a-form-item name="name" :label="$t('name')" :rules="[{ required: true, message: `${placeholder.groupNamePh}` }]">
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/resource/components/List.vue b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/List.vue
index 6a5923be77..7c2d42c3e8 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/resource/components/List.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/List.vue
@@ -96,8 +96,9 @@ function releaseModal(record: any) {
   }
   Modal.confirm({
     title: t('releaseOptModalTitle'),
-    okText: t('confirm'),
-    cancelText: t('cancel'),
+    content: '',
+    okText: '',
+    cancelText: '',
     onOk: () => {
       releaseJob(record)
     },
@@ -173,8 +174,6 @@ async function removeGroup(record: IIOptimizeGroupItem) {
   if (res) {
     Modal.confirm({
       title: t('deleteGroupModalTitle'),
-      okText: t('ok'),
-      cancelText: t('cancel'),
       onOk: async () => {
         await groupDeleteAPI({ name: record.name })
         message.success(`${t('remove')} ${t('success')}`)
@@ -186,7 +185,6 @@ async function removeGroup(record: IIOptimizeGroupItem) {
   Modal.warning({
     title: t('cannotDeleteGroupModalTitle'),
     content: t('cannotDeleteGroupModalContent'),
-    okText: t('ok'),
   })
 }
 
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/resource/components/ScaleOut.vue b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/ScaleOut.vue
index ea1bd33e9b..001d403565 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/resource/components/ScaleOut.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/ScaleOut.vue
@@ -76,8 +76,6 @@ onMounted(() => {
     :title="$t('scaleOut')"
     :confirm-loading="confirmLoading"
     :closable="false"
-    :ok-text="$t('ok')"
-    :cancel-text="$t('cancel')"
     @ok="handleOk"
     @cancel="handleCancel"
   >
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Operations.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Operations.vue
index 52fb98ebc0..c9cd4e7481 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Operations.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Operations.vue
@@ -126,9 +126,7 @@ onMounted(() => {
   <AModal
     :visible="visible"
     :width="560"
-    :ok-text="$t('ok')"
-    :cancel-text="$t('cancel')"
-    :title="$t('operationDetails')"
+    :title="`${$t('operationDetails')}`"
     class="operation-wrap"
     @cancel="cancel"
   >
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Optimizing.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Optimizing.vue
index 267722bda5..7482b4f38d 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Optimizing.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Optimizing.vue
@@ -124,8 +124,9 @@ async function refreshOptimizingProcesses() {
 async function cancel() {
   Modal.confirm({
     title: t('cancelOptimizingProcessOptModalTitle'),
-    okText: t('ok'),
-    cancelText: t('cancel'),
+    content: '',
+    okText: '',
+    cancelText: '',
     onOk: async () => {
       try {
         loading.value = true
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/tables/index.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/index.vue
index fe683eddbe..55d9b8c328 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/tables/index.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/tables/index.vue
@@ -44,9 +44,9 @@ export default defineComponent({
     const detailRef = ref()
 
     const tabConfigs = shallowReactive([
-      { key: 'Snapshots', label: 'snapshots' },
-      { key: 'Optimizing', label: 'optimizing' },
-      { key: 'Operations', label: 'operations' },
+      { key: 'Snapshots', label: 'Snapshots' },
+      { key: 'Optimizing', label: 'Optimizing' },
+      { key: 'Operations', label: 'Operations' },
     ])
 
     const state = reactive({
@@ -156,13 +156,13 @@ export default defineComponent({
       </div>
       <div class="content">
         <a-tabs v-model:activeKey="activeKey" destroy-inactive-tab-pane @change="onChangeTab">
-          <a-tab-pane key="Details" :tab="$t('details')" force-render>
+          <a-tab-pane key="Details" tab="Details" force-render>
             <UDetails ref="detailRef" @set-base-detail-info="setBaseDetailInfo" />
           </a-tab-pane>
-          <a-tab-pane v-if="detailLoaded" key="Files" :tab="$t('files')">
+          <a-tab-pane v-if="detailLoaded" key="Files" tab="Files">
             <UFiles :has-partition="baseInfo.hasPartition" />
           </a-tab-pane>
-          <a-tab-pane v-for="tab in tabConfigs" :key="tab.key" :tab="$t(tab.label)">
+          <a-tab-pane v-for="tab in tabConfigs" :key="tab.key" :tab="`${tab.label}`">
             <component :is="`U${tab.key}`" />
           </a-tab-pane>
         </a-tabs>
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue b/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue
index 286996f8f9..3487484ffe 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue
@@ -30,9 +30,14 @@ const isEmpty = computed(() => {
 const status = computed(() => {
   return props.info?.status
 })
+
+// const innerWidth = computed(() => {
+//   return window.innerWidth - 220 - 34
+// })
 </script>
 
 <template>
+  <!-- :style="{width: `${innerWidth}px`}" -->
   <div class="sql-result-wrap">
     <div class="result-status" :style="{ background: debugResultBgcMap[status as keyof typeof debugResultBgcMap] }">
       <template v-if="status === 'Running'">

From a648a76dc964a4bdf37fb617cfd83da1fa981af0 Mon Sep 17 00:00:00 2001
From: tcodehuber <tcodehuber@gmail.com>
Date: Fri, 5 Jul 2024 14:26:15 +0800
Subject: [PATCH 03/25] [Hotfix] Meet NPE when loading tables which use s3
 storage (#3007)

---
 .../main/java/org/apache/amoro/table/TableMetaStore.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/amoro-core/src/main/java/org/apache/amoro/table/TableMetaStore.java b/amoro-core/src/main/java/org/apache/amoro/table/TableMetaStore.java
index 0f44548d0d..b3ab1793e3 100644
--- a/amoro-core/src/main/java/org/apache/amoro/table/TableMetaStore.java
+++ b/amoro-core/src/main/java/org/apache/amoro/table/TableMetaStore.java
@@ -510,8 +510,12 @@ private String getConfPath(Path confPath, String confName) {
 
     private Configuration buildConfiguration(TableMetaStore metaStore) {
       Configuration configuration = new Configuration();
-      configuration.addResource(new ByteArrayInputStream(metaStore.getCoreSite()));
-      configuration.addResource(new ByteArrayInputStream(metaStore.getHdfsSite()));
+      if (!ArrayUtils.isEmpty(metaStore.getCoreSite())) {
+        configuration.addResource(new ByteArrayInputStream(metaStore.getCoreSite()));
+      }
+      if (!ArrayUtils.isEmpty(metaStore.getHdfsSite())) {
+        configuration.addResource(new ByteArrayInputStream(metaStore.getHdfsSite()));
+      }
       if (!ArrayUtils.isEmpty(metaStore.getMetaStoreSite())) {
         configuration.addResource(new ByteArrayInputStream(metaStore.getMetaStoreSite()));
       }

From 89dfe86aef9ded30f95d06671280c6e5a29178ec Mon Sep 17 00:00:00 2001
From: Congxian Qiu <qcx978132955@gmail.com>
Date: Fri, 5 Jul 2024 14:35:17 +0800
Subject: [PATCH 04/25] [AMORO-3009] Treat read and write cost as the same when
 evaluating optimizing (#3010)

---
 .../server/optimizing/plan/CommonPartitionEvaluator.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/CommonPartitionEvaluator.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/CommonPartitionEvaluator.java
index df44035481..6ed8214b1d 100644
--- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/CommonPartitionEvaluator.java
+++ b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/optimizing/plan/CommonPartitionEvaluator.java
@@ -263,11 +263,11 @@ public boolean isNecessary() {
   @Override
   public long getCost() {
     if (cost < 0) {
-      // We estimate that the cost of writing is 3 times that of reading.
+      // We estimate that the cost of writing is the same as reading.
       // When rewriting the Position delete file, only the primary key field of the segment file
       // will be read, so only one-tenth of the size is calculated based on the size.
       cost =
-          (fragmentFileSize + rewriteSegmentFileSize + undersizedSegmentFileSize) * 4
+          (fragmentFileSize + rewriteSegmentFileSize + undersizedSegmentFileSize) * 2
               + rewritePosSegmentFileSize / 10
               + posDeleteFileSize
               + equalityDeleteFileSize;

From 329d920b4e6dd4f9be6041bb2b23102c7eadb0eb Mon Sep 17 00:00:00 2001
From: tcodehuber <tcodehuber@gmail.com>
Date: Fri, 5 Jul 2024 15:25:51 +0800
Subject: [PATCH 05/25] [AMORO-2988] Add more base info for the table detail
 page (#2989)

* [AMORO-2988] Add more base info for the table detail page

* code refactor

* code refactor

* code refactor

* code refactor

* remove some code
---
 .../src/views/tables/components/Details.vue   |  6 ++---
 .../src/views/tables/index.vue                | 17 +++++++------
 .../MixedAndIcebergTableDescriptor.java       | 24 +++++++++++++++++++
 .../dashboard/PaimonTableDescriptor.java      |  1 +
 .../dashboard/controller/TableController.java |  6 +++++
 5 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Details.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Details.vue
index a5bcba3c95..a4caa6b117 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Details.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Details.vue
@@ -62,12 +62,10 @@ const changeMetricsMap: IMap<string | number> = {
 const state = reactive({
   detailLoading: false,
   baseDetailInfo: {
+    optimizingStatus: '',
     tableType: '',
     tableName: '',
     createTime: '',
-    size: '',
-    file: '',
-    averageFile: '',
     tableFormat: '',
     hasPartition: false, // Whether there is a partition, if there is no partition, the file list will be displayed
   } as IBaseDetailInfo,
@@ -93,7 +91,7 @@ async function getTableDetails() {
     state.baseDetailInfo = {
       ...tableSummary,
       tableType,
-      tableName: tableIdentifier?.tableName || '',
+      tableName: `${tableIdentifier?.catalog || ''}.${tableIdentifier?.database || ''}.${tableIdentifier?.tableName || ''}`,
       createTime: createTime ? dateFormat(createTime) : '',
       hasPartition: !!(partitionColumnList?.length),
     }
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/tables/index.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/index.vue
index 55d9b8c328..5e5eca29af 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/tables/index.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/tables/index.vue
@@ -53,12 +53,10 @@ export default defineComponent({
       activeKey: 'Details',
       isSecondaryNav: false,
       baseInfo: {
+        optimizingStatus: '',
         tableType: '',
         tableName: '',
         createTime: '',
-        size: '',
-        file: '',
-        averageFile: '',
         tableFormat: '',
         hasPartition: false,
       } as IBaseDetailInfo,
@@ -141,15 +139,16 @@ export default defineComponent({
         <div class="g-flex-col">
           <div class="g-flex">
             <span :title="baseInfo.tableName" class="table-name g-text-nowrap">{{ baseInfo.tableName }}</span>
-            <span v-if="!isIceberg" class="create-time">{{ `${$t('createTime')}: ${baseInfo.createTime}` }}</span>
           </div>
           <div class="table-info g-flex-ac">
-            <p>{{ `${$t('table')}${$t('size')}` }}: <span class="text-color">{{ baseInfo.size }}</span></p>
+            <p>{{ $t('optimizingStatus') }}: <span class="text-color">{{ baseInfo.optimizingStatus }}</span></p>
             <a-divider type="vertical" />
-            <p>{{ $t('file') }}:  <span class="text-color">{{ baseInfo.file }}</span></p>
-            <a-divider type="vertical" />
-            <p>{{ $t('averageFileSize') }}: <span class="text-color">{{ baseInfo.averageFile }}</span></p>
+            <p>{{ $t('records') }}: <span class="text-color">{{ baseInfo.records }}</span></p>
             <a-divider type="vertical" />
+            <template v-if="!isIceberg">
+              <p>{{ $t('createTime') }}: <span class="text-color">{{ baseInfo.createTime }}</span></p>
+              <a-divider type="vertical" />
+            </template>
             <p>{{ $t('tableFormat') }}: <span class="text-color">{{ baseInfo.tableFormat }}</span></p>
           </div>
         </div>
@@ -194,7 +193,7 @@ export default defineComponent({
     font-size: 24px;
     line-height: 1.5;
     margin-right: 16px;
-    max-width: 400px;
+    max-width: 600px;
     padding-left: 24px;
   }
   .table-info {
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java
index 16b2231354..bc456a0d6d 100644
--- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java
+++ b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java
@@ -155,6 +155,8 @@ public ServerTableMeta getTableDetail(AmoroTable<?> amoroTable) {
     tableSummary.put("file", tableFileCnt);
     tableSummary.put(
         "averageFile", AmsUtil.byteToXB(tableFileCnt == 0 ? 0 : tableSize / tableFileCnt));
+
+    tableSummary.put("records", getRecordsOfTable(table));
     tableSummary.put("tableFormat", tableFormat);
     serverTableMeta.setTableSummary(tableSummary);
     return serverTableMeta;
@@ -173,6 +175,28 @@ private String decorateTableFormat(AmoroTable table) {
     return sb.toString();
   }
 
+  private long getRecordsOfTable(MixedTable mixedTable) {
+    long totalRecords;
+    if (mixedTable.isKeyedTable()) {
+      Snapshot changeSnapshot =
+          SnapshotUtil.latestSnapshot(mixedTable.asKeyedTable().changeTable(), null);
+      Snapshot baseSnapshot =
+          SnapshotUtil.latestSnapshot(mixedTable.asKeyedTable().baseTable(), null);
+      totalRecords =
+          PropertyUtil.propertyAsLong(
+                  changeSnapshot.summary(), SnapshotSummary.TOTAL_RECORDS_PROP, 0L)
+              + PropertyUtil.propertyAsLong(
+                  baseSnapshot.summary(), SnapshotSummary.TOTAL_RECORDS_PROP, 0L);
+    } else {
+      totalRecords =
+          PropertyUtil.propertyAsLong(
+              SnapshotUtil.latestSnapshot(mixedTable.asUnkeyedTable(), null).summary(),
+              SnapshotSummary.TOTAL_RECORDS_PROP,
+              0L);
+    }
+    return totalRecords;
+  }
+
   private Long snapshotIdOfTableRef(Table table, String ref) {
     if (ref == null) {
       ref = SnapshotRef.MAIN_BRANCH;
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/PaimonTableDescriptor.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/PaimonTableDescriptor.java
index 598f991cb0..ad878b268f 100644
--- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/PaimonTableDescriptor.java
+++ b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/PaimonTableDescriptor.java
@@ -151,6 +151,7 @@ public ServerTableMeta getTableDetail(AmoroTable<?> amoroTable) {
       tableSummary.put("averageFile", averageFileSize);
       tableSummary.put("file", fileCount);
       tableSummary.put("size", totalSize);
+      tableSummary.put("records", snapshotsOfTable.getRecords());
 
       baseMetric.put("totalSize", totalSize);
       baseMetric.put("fileCount", fileCount);
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java
index 2efa3315f7..30c367f1fe 100644
--- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java
+++ b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java
@@ -137,6 +137,12 @@ public void getTableDetail(Context ctx) {
     ServerTableMeta serverTableMeta =
         tableDescriptor.getTableDetail(
             TableIdentifier.of(catalog, database, tableName).buildTableIdentifier());
+    ServerTableIdentifier serverTableIdentifier =
+        tableService.getServerTableIdentifier(
+            TableIdentifier.of(catalog, database, tableName).buildTableIdentifier());
+    Map<String, Object> tableSummary = serverTableMeta.getTableSummary();
+    tableSummary.put(
+        "optimizingStatus", tableService.getRuntime(serverTableIdentifier).getOptimizingStatus());
 
     ctx.json(OkResponse.of(serverTableMeta));
   }

From 88d10940ddac854e71c8af4da0fd12d225919c43 Mon Sep 17 00:00:00 2001
From: tcodehuber <tcodehuber@gmail.com>
Date: Fri, 5 Jul 2024 15:27:12 +0800
Subject: [PATCH 06/25] [AMORO-2971] Remove the redundant status bar for the
 Terminal (#2974)

* [AMORO-2971] Remove the redundant status bar for the Terminal

* remove unused code

* WIP [AMORO-3002] Complete internationalization for some remaining pages (#3006)

[AMORO-3002] Complete internationalization for some remaining pages

* resolve conflicts

---------

Co-authored-by: chouchouji <70570907+chouchouji@users.noreply.github.com>
---
 .../views/terminal/components/sql-result.vue  |  7 ----
 .../src/views/terminal/index.vue              | 37 ++++++++++---------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue b/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue
index 3487484ffe..a17486abf2 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue
@@ -27,13 +27,6 @@ const isEmpty = computed(() => {
   return !props.info || !props.info?.columns
 })
 
-const status = computed(() => {
-  return props.info?.status
-})
-
-// const innerWidth = computed(() => {
-//   return window.innerWidth - 220 - 34
-// })
 </script>
 
 <template>
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/terminal/index.vue b/amoro-ams/amoro-ams-dashboard/src/views/terminal/index.vue
index bf871af693..4b8af9845f 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/terminal/index.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/terminal/index.vue
@@ -399,21 +399,6 @@ export default defineComponent({
                 }"
               />
             </div>
-            <div v-if="runStatus" class="run-status" :style="{ background: bgcMap[runStatus] }">
-              <template v-if="runStatus === 'Running' || runStatus === 'Canceling'">
-                <loading-outlined style="color: #1890ff" />
-              </template>
-              <template v-if="runStatus === 'Canceled' || runStatus === 'Failed'">
-                <close-circle-outlined style="color: #ff4d4f" />
-              </template>
-              <template v-if="runStatus === 'Finished'">
-                <check-circle-outlined style="color: #52c41a" />
-              </template>
-              <template v-if="runStatus === 'Created'">
-                <close-circle-outlined style="color:#333" />
-              </template>
-              <span class="g-ml-12">{{ $t(runStatus) }}</span>
-            </div>
           </div>
         </div>
         <div class="sql-shortcuts">
@@ -430,6 +415,23 @@ export default defineComponent({
           </a-button>
         </div>
       </div>
+
+      <div v-if="runStatus" class="run-status" :style="{ background: bgcMap[runStatus] }">
+          <template v-if="runStatus === 'Running' || runStatus === 'Canceling'">
+            <loading-outlined style="color: #1890ff" />
+          </template>
+          <template v-if="runStatus === 'Canceled' || runStatus === 'Failed'">
+            <close-circle-outlined style="color: #ff4d4f" />
+          </template>
+          <template v-if="runStatus === 'Finished'">
+            <check-circle-outlined style="color: #52c41a" />
+          </template>
+          <template v-if="runStatus === 'Created'">
+            <close-circle-outlined style="color:#333" />
+          </template>
+          <span class="g-ml-12">{{ $t(runStatus) }}</span>
+      </div>
+
       <!-- sql result -->
       <div
         class="sql-result" :style="{ height: `calc(100% - ${sqlResultHeight}px)` }"
@@ -638,13 +640,14 @@ export default defineComponent({
   }
 
   .run-status {
-    padding: 6px 12px;
-    position: absolute;
+    padding: 8px 0px;
+    position: flex;
     left: 0;
     bottom: 0;
     width: 100%;
     z-index: 2;
     background-color: #fff;
+    border-top: 1px solid #e5e5e5;
   }
 
   .tab-operation {

From fcc794c36a072d38e4961dccb5432304ffdda7a1 Mon Sep 17 00:00:00 2001
From: chouchouji <70570907+chouchouji@users.noreply.github.com>
Date: Mon, 8 Jul 2024 10:29:49 +0800
Subject: [PATCH 07/25] [Improvement] Complete internationalization for some
 remaining pages (#3011)

* [Improvement] Complete internationalization for some remaining pages

* refactor(amoro-ams-dashboard): optimize code

* refactor(amoro-ams-dashboard): optimize code

* refactor(amoro-ams-dashboard): optimize code
---
 amoro-ams/amoro-ams-dashboard/src/App.vue     |   6 +-
 .../src/components/Topbar.vue                 | 140 ++++++++----------
 .../amoro-ams-dashboard/src/language/en.ts    |   8 +
 .../amoro-ams-dashboard/src/language/zh.ts    |   8 +
 .../hive-details/components/ErrorMsg.vue      |   2 +-
 .../src/views/hive-details/upgrade.vue        |   4 +-
 .../src/views/optimize/components/List.vue    |   3 -
 .../views/optimize/components/ScaleOut.vue    |   9 +-
 .../src/views/optimize/index.vue              |   1 -
 .../views/resource/components/GroupModal.vue  |   9 +-
 .../src/views/resource/components/List.vue    |   3 -
 .../views/tables/components/Operations.vue    |   4 +-
 .../views/tables/components/Optimizing.vue    |   3 -
 .../src/views/tables/components/Selector.vue  |   8 +-
 .../src/views/tables/index.vue                |  12 +-
 .../views/terminal/components/sql-result.vue  |   5 +-
 16 files changed, 115 insertions(+), 110 deletions(-)

diff --git a/amoro-ams/amoro-ams-dashboard/src/App.vue b/amoro-ams/amoro-ams-dashboard/src/App.vue
index 888b68c62b..4b0194fc51 100644
--- a/amoro-ams/amoro-ams-dashboard/src/App.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/App.vue
@@ -20,9 +20,11 @@
 import zhCN from 'ant-design-vue/es/locale/zh_CN'
 import enUS from 'ant-design-vue/es/locale/en_US'
 import dayjs from 'dayjs'
-import { ref, watch } from 'vue'
+import { watch } from 'vue'
+import { useI18n } from 'vue-i18n'
+import 'dayjs/locale/zh-cn';
 
-const locale = ref(enUS.locale)
+const { locale } = useI18n()
 dayjs.locale('en')
 
 watch(locale, (val) => {
diff --git a/amoro-ams/amoro-ams-dashboard/src/components/Topbar.vue b/amoro-ams/amoro-ams-dashboard/src/components/Topbar.vue
index aea7ca84a1..dacdfd89fc 100644
--- a/amoro-ams/amoro-ams-dashboard/src/components/Topbar.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/components/Topbar.vue
@@ -16,8 +16,8 @@
   limitations under the License.
  / -->
 
-<script lang="ts">
-import { defineComponent, onMounted, reactive } from 'vue'
+<script setup lang="ts">
+import { onMounted, reactive } from 'vue'
 import { Modal } from 'ant-design-vue'
 import { useI18n } from 'vue-i18n'
 import { useRouter } from 'vue-router'
@@ -25,78 +25,67 @@ import { useRouter } from 'vue-router'
 import useStore from '@/store'
 import { getVersionInfo } from '@/services/global.service'
 import loginService from '@/services/login.service'
+import { DownOutlined, QuestionCircleOutlined, LogoutOutlined, TranslationOutlined } from '@ant-design/icons-vue'
 
 interface IVersion {
   version: string
   commitTime: string
 }
 
-export default defineComponent ({
-  name: 'Topbar',
-  setup() {
-    const verInfo = reactive<IVersion>({
-      version: '',
-      commitTime: '',
-    })
-
-    const { t, locale } = useI18n()
-    const router = useRouter()
-
-    const getVersion = async () => {
-      const res = await getVersionInfo()
-      if (res) {
-        verInfo.version = res.version
-        verInfo.commitTime = res.commitTime
-      }
-    }
+const verInfo = reactive<IVersion>({
+  version: '',
+  commitTime: '',
+})
 
-    const goLoginPage = () => {
-      router.push({ path: '/login' })
-    }
+const { t, locale } = useI18n()
+const router = useRouter()
+const store = useStore()
 
-    const handleLogout = async () => {
-      Modal.confirm({
-        title: t('logoutModalTitle'),
-        okText: t('confirm'),
-        cancelText: t('cancel'),
-        onOk: async () => {
-          try {
-            await loginService.logout()
-          }
-          catch (error) {
-          }
-          finally {
-            const store = useStore()
-            store.updateUserInfo({
-              userName: '',
-            })
-            goLoginPage()
-          }
-        },
-      })
-    }
+const getVersion = async () => {
+  const res = await getVersionInfo()
+  if (res) {
+    verInfo.version = res.version
+    verInfo.commitTime = res.commitTime
+  }
+}
 
-    const goDocs = () => {
-      window.open('https://amoro.apache.org/docs/latest/')
-    }
+const goLoginPage = () => {
+  router.push({ path: '/login' })
+}
 
-    const setLocale = ({ key }: { key: string }) => {
-      if(locale.value !== key) {
-        locale.value = key
+const handleLogout = async () => {
+  Modal.confirm({
+    title: t('logoutModalTitle'),
+    onOk: async () => {
+      try {
+        await loginService.logout()
       }
-    };
+      catch (error) {
+      }
+      finally {
+        store.updateUserInfo({
+          userName: '',
+        })
+        goLoginPage()
+      }
+    },
+  })
+}
 
-    onMounted(() => {
-      getVersion()
-    })
+const goDocs = () => {
+  window.open('https://amoro.apache.org/docs/latest/')
+}
 
-    return {
-      verInfo,
-      goDocs,
-      handleLogout,
-      setLocale,
-    }
-  },
+const setLocale = () => {
+  if(locale.value === 'zh') {
+    locale.value = 'en'
+  } else {
+    locale.value = 'zh'
+  }
+}
+
+onMounted(() => {
+  getVersion()
 })
 </script>
 
@@ -106,29 +95,22 @@ export default defineComponent ({
       <span class="g-mr-8">{{ `${$t('version')}:  ${verInfo.version}` }}</span>
       <span class="g-mr-8">{{ `${$t('commitTime')}:  ${verInfo.commitTime}` }}</span>
     </div>
-    <a-tooltip placement="bottomRight" arrow-point-at-center overlay-class-name="topbar-tooltip">
-      <template #title>
-        {{ $t('userGuide') }}
-      </template>
-      <question-circle-outlined class="question-icon" @click="goDocs" />
-    </a-tooltip>
     <a-dropdown>
-      <TranslationOutlined class="g-ml-8" />
+      <span>{{ store.userInfo.userName}} <DownOutlined /></span>
       <template #overlay>
-        <a-menu @click="setLocale">
-          <a-menu-item key="en">English</a-menu-item>
-          <a-menu-item key="zh">中文</a-menu-item>
+        <a-menu>
+          <a-menu-item key="userGuide" @click="goDocs">
+            <question-circle-outlined /> {{ $t('userGuide') }}
+          </a-menu-item>
+          <a-menu-item key="locale" @click="setLocale">
+            <translation-outlined /> {{ locale === 'zh' ? '切换至英文' : 'Switch To Chinese' }}
+          </a-menu-item>
+          <a-menu-item key="logout" @click="handleLogout">
+            <logout-outlined /> {{ $t('logout') }}
+          </a-menu-item>
         </a-menu>
       </template>
     </a-dropdown>
-    <a-tooltip>
-      <template #title>
-        {{ $t('logout') }}
-      </template>
-      <a-button class="logout-button" @click="handleLogout">
-        <LogoutOutlined style="font-size: 1.2em" />
-      </a-button>
-    </a-tooltip>
   </div>
 </template>
 
diff --git a/amoro-ams/amoro-ams-dashboard/src/language/en.ts b/amoro-ams/amoro-ams-dashboard/src/language/en.ts
index b49d680ac8..60c6ed7eef 100644
--- a/amoro-ams/amoro-ams-dashboard/src/language/en.ts
+++ b/amoro-ams/amoro-ams-dashboard/src/language/en.ts
@@ -205,4 +205,12 @@ export default {
   noResourceGroupsTitle: 'No resource groups available.',
   noResourceGroupsContent: 'Please create an optimizer group first.',
   goToButtonText: 'Go',
+  snapshots: 'Snapshots',
+  details: 'Details',
+  operations: 'Operations',
+  Running: 'Running',
+  Canceled: 'Canceled',
+  Failed: 'Failed',
+  Finished: 'Finished',
+  Created: 'Created',
 }
diff --git a/amoro-ams/amoro-ams-dashboard/src/language/zh.ts b/amoro-ams/amoro-ams-dashboard/src/language/zh.ts
index d8bb45b155..23cdeee185 100644
--- a/amoro-ams/amoro-ams-dashboard/src/language/zh.ts
+++ b/amoro-ams/amoro-ams-dashboard/src/language/zh.ts
@@ -205,4 +205,12 @@ export default {
   noResourceGroupsTitle: '没有任何优化组',
   noResourceGroupsContent: '需要首先创建一个默认优化组',
   goToButtonText: '前往',
+  snapshots: '快照',
+  details: '详情',
+  operations: '操作',
+  Running: '运行中',
+  Canceled: '已取消',
+  Failed: '已失败',
+  Finished: '已结束',
+  Created: '已创建',
 }
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/ErrorMsg.vue b/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/ErrorMsg.vue
index 609dcadd9d..c0934cbf25 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/ErrorMsg.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/hive-details/components/ErrorMsg.vue
@@ -31,7 +31,7 @@ const open = ref(true)
   <AModal
     v-model:open="open"
     :width="560"
-    :title="`${$t('errorMessage')}`"
+    :title="$t('errorMessage')"
     :footer="null"
     class="upgrade-error"
     @cancel="emit('cancel')"
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/hive-details/upgrade.vue b/amoro-ams/amoro-ams-dashboard/src/views/hive-details/upgrade.vue
index a5e22f9a3f..bce4ae9270 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/hive-details/upgrade.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/hive-details/upgrade.vue
@@ -73,7 +73,7 @@ async function getDetails() {
   }
 }
 
-function onCofirm() {
+function onConfirm() {
   getParams()
 }
 
@@ -158,7 +158,7 @@ onMounted(() => {
         </a-form>
       </div>
       <div class="footer-btn">
-        <a-button type="primary" :loading="loading" class="btn g-mr-12" @click="onCofirm">
+        <a-button type="primary" :loading="loading" class="btn g-mr-12" @click="onConfirm">
           {{ $t('ok') }}
         </a-button>
         <a-button type="ghost" class="btn" @click="cancel">
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/List.vue b/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/List.vue
index 112d67b921..a815b24f68 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/List.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/List.vue
@@ -110,9 +110,6 @@ function releaseModal(record: any) {
   }
   Modal.confirm({
     title: t('releaseOptModalTitle'),
-    content: '',
-    okText: '',
-    cancelText: '',
     onOk: () => {
       releaseJob(record)
     },
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/ScaleOut.vue b/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/ScaleOut.vue
index 8dc3eff9eb..f9a1c93600 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/ScaleOut.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/ScaleOut.vue
@@ -85,7 +85,14 @@ onMounted(() => {
 </script>
 
 <template>
-  <AModal :visible="props.visible" :title="$t('scaleOut')" :confirm-loading="confirmLoading" :closable="false" @ok="handleOk" @cancel="handleCancel">
+  <AModal 
+    :open="props.visible" 
+    :title="$t('scaleOut')" 
+    :confirm-loading="confirmLoading" 
+    :closable="false" 
+    @ok="handleOk" 
+    @cancel="handleCancel"
+  >
     <a-form ref="formRef" :model="formState" class="label-120">
       <a-form-item name="resourceGroup" :label="$t('resourceGroup')" :rules="[{ required: true, message: `${placeholder.resourceGroupPh}` }]">
         <a-select
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/optimize/index.vue b/amoro-ams/amoro-ams-dashboard/src/views/optimize/index.vue
index fbc8faa332..1b017b50f8 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/optimize/index.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/optimize/index.vue
@@ -25,7 +25,6 @@ import type { IGroupItem, IGroupItemInfo, ILableAndValue, IMap } from '@/types/c
 import { usePlaceholder } from '@/hooks/usePlaceholder'
 import { usePagination } from '@/hooks/usePagination'
 import { getOptimizerGroups, getQueueResourceInfo } from '@/services/optimize.service'
-// import ScaleOutModal from './components/ScaleOut.vue'
 import { mbToSize } from '@/utils'
 
 export default defineComponent({
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/resource/components/GroupModal.vue b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/GroupModal.vue
index 19e61789cc..12469f3165 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/resource/components/GroupModal.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/GroupModal.vue
@@ -109,8 +109,13 @@ onMounted(() => {
 
 <template>
   <AModal
-    :visible="true" :title="edit ? $t('editgroup') : $t('addgroup')" :confirm-loading="confirmLoading"
-    :closable="false" class="group-modal" @ok="handleOk" @cancel="handleCancel"
+    :open="true" 
+    :title="edit ? $t('editgroup') : $t('addgroup')" 
+    :confirm-loading="confirmLoading"
+    :closable="false"
+    class="group-modal" 
+    @ok="handleOk" 
+    @cancel="handleCancel"
   >
     <a-form ref="formRef" :model="formState" class="label-120">
       <a-form-item name="name" :label="$t('name')" :rules="[{ required: true, message: `${placeholder.groupNamePh}` }]">
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/resource/components/List.vue b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/List.vue
index 7c2d42c3e8..981e370995 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/resource/components/List.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/List.vue
@@ -96,9 +96,6 @@ function releaseModal(record: any) {
   }
   Modal.confirm({
     title: t('releaseOptModalTitle'),
-    content: '',
-    okText: '',
-    cancelText: '',
     onOk: () => {
       releaseJob(record)
     },
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Operations.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Operations.vue
index c9cd4e7481..2063bff44d 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Operations.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Operations.vue
@@ -124,9 +124,9 @@ onMounted(() => {
     </a-table>
   </div>
   <AModal
-    :visible="visible"
+    :open="visible"
     :width="560"
-    :title="`${$t('operationDetails')}`"
+    :title="$t('operationDetails')"
     class="operation-wrap"
     @cancel="cancel"
   >
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Optimizing.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Optimizing.vue
index 7482b4f38d..eeb45138f8 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Optimizing.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Optimizing.vue
@@ -124,9 +124,6 @@ async function refreshOptimizingProcesses() {
 async function cancel() {
   Modal.confirm({
     title: t('cancelOptimizingProcessOptModalTitle'),
-    content: '',
-    okText: '',
-    cancelText: '',
     onOk: async () => {
       try {
         loading.value = true
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Selector.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Selector.vue
index cf41fe50ab..bc9162d808 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Selector.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Selector.vue
@@ -88,11 +88,11 @@ onMounted(() => {
       <template #overlay>
         <div>
           <div class="branch-selector-search">
-            <a-input v-show="tabActiveKey === branchTypeMap.BRANCH" v-model:value="branchSearchKey" :placeholder="$t('Filter branches/tags')" @click="onClickInput" />
-            <a-input v-show="tabActiveKey === branchTypeMap.TAG" v-model:value="tagSearchKey" :placeholder="$t('Filter branches/tags')" @click="onClickInput" />
+            <a-input v-show="tabActiveKey === branchTypeMap.BRANCH" v-model:value="branchSearchKey" :placeholder="$t('filterBranchesOrTags')" @click="onClickInput" />
+            <a-input v-show="tabActiveKey === branchTypeMap.TAG" v-model:value="tagSearchKey" :placeholder="$t('filterBranchesOrTags')" @click="onClickInput" />
           </div>
           <a-tabs v-model:activeKey="tabActiveKey" type="card">
-            <a-tab-pane :key="branchTypeMap.BRANCH" tab="Branches">
+            <a-tab-pane :key="branchTypeMap.BRANCH" :tab="$t('branches')">
               <template v-if="!!actualBranchList.length">
                 <div v-for="(item, key) in actualBranchList" :key="key" class="branch-selector-item" @click="selectObject(item)">
                   <div class="item-icon">
@@ -103,7 +103,7 @@ onMounted(() => {
               </template>
               <span v-else class="empty-tips">{{ $t('nothingToShow') }}</span>
             </a-tab-pane>
-            <a-tab-pane :key="branchTypeMap.TAG" tab="Tags">
+            <a-tab-pane :key="branchTypeMap.TAG" :tab="$t('tags')">
               <template v-if="!!actualTagList.length">
                 <div v-for="(item, key) in actualTagList" :key="key" class="branch-selector-item" @click="selectObject(item)">
                   <div class="item-icon">
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/tables/index.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/index.vue
index 5e5eca29af..f5aa495ee6 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/tables/index.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/tables/index.vue
@@ -44,9 +44,9 @@ export default defineComponent({
     const detailRef = ref()
 
     const tabConfigs = shallowReactive([
-      { key: 'Snapshots', label: 'Snapshots' },
-      { key: 'Optimizing', label: 'Optimizing' },
-      { key: 'Operations', label: 'Operations' },
+      { key: 'Snapshots', label: 'snapshots' },
+      { key: 'Optimizing', label: 'optimizing' },
+      { key: 'Operations', label: 'operations' },
     ])
 
     const state = reactive({
@@ -155,13 +155,13 @@ export default defineComponent({
       </div>
       <div class="content">
         <a-tabs v-model:activeKey="activeKey" destroy-inactive-tab-pane @change="onChangeTab">
-          <a-tab-pane key="Details" tab="Details" force-render>
+          <a-tab-pane key="Details" :tab="$t('details')" force-render>
             <UDetails ref="detailRef" @set-base-detail-info="setBaseDetailInfo" />
           </a-tab-pane>
-          <a-tab-pane v-if="detailLoaded" key="Files" tab="Files">
+          <a-tab-pane v-if="detailLoaded" key="Files" :tab="$t('files')">
             <UFiles :has-partition="baseInfo.hasPartition" />
           </a-tab-pane>
-          <a-tab-pane v-for="tab in tabConfigs" :key="tab.key" :tab="`${tab.label}`">
+          <a-tab-pane v-for="tab in tabConfigs" :key="tab.key" :tab="$t(tab.label)">
             <component :is="`U${tab.key}`" />
           </a-tab-pane>
         </a-tabs>
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue b/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue
index a17486abf2..aeb373a3e2 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/terminal/components/sql-result.vue
@@ -27,6 +27,9 @@ const isEmpty = computed(() => {
   return !props.info || !props.info?.columns
 })
 
+const status = computed(() => {
+  return props.info?.status
+})
 </script>
 
 <template>
@@ -45,7 +48,7 @@ const isEmpty = computed(() => {
       <template v-if="status === 'Created'">
         <close-circle-outlined style="color:#333" />
       </template>
-      <span class="g-ml-8">{{ status }}</span>
+      <span class="g-ml-8">{{ $t(status) }}</span>
     </div>
     <div v-if="isEmpty" class="empty">
       {{ $t('noResult') }}

From 72380a4fa3d8f2040f7f1bccf50c90702c116933 Mon Sep 17 00:00:00 2001
From: Wang Tao <hzwangtao6@corp.netease.com>
Date: Wed, 10 Jul 2024 14:41:45 +0800
Subject: [PATCH 08/25] [AMORO-3015]terminal can't create iceberg table when
 using unified catalog (#3016)

issue_3015 fix 3015
---
 .../amoro/server/terminal/local/LocalSessionFactory.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/local/LocalSessionFactory.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/local/LocalSessionFactory.java
index 1aef85e496..b264e6677e 100644
--- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/local/LocalSessionFactory.java
+++ b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/terminal/local/LocalSessionFactory.java
@@ -22,6 +22,7 @@
 import org.apache.amoro.api.config.ConfigOptions;
 import org.apache.amoro.api.config.Configurations;
 import org.apache.amoro.server.AmoroManagementConf;
+import org.apache.amoro.server.catalog.CatalogType;
 import org.apache.amoro.server.dashboard.utils.DesensitizationUtil;
 import org.apache.amoro.server.terminal.SparkContextUtil;
 import org.apache.amoro.server.terminal.TerminalSession;
@@ -79,7 +80,7 @@ public TerminalSession create(TableMetaStore metaStore, Configurations configura
 
     Map<String, String> finallyConf = configuration.toMap();
     catalogs.stream()
-        .filter(c -> isExternalConnector(c, configuration))
+        .filter(c -> isExternalConnector(c, configuration) || isExternalMetastore(c, configuration))
         .forEach(c -> setHadoopConfigToSparkSession(c, session, metaStore));
 
     for (String key : sparkConf.keySet()) {
@@ -93,6 +94,12 @@ public TerminalSession create(TableMetaStore metaStore, Configurations configura
     return new LocalTerminalSession(catalogs, session, initializeLogs, finallyConf);
   }
 
+  private boolean isExternalMetastore(String catalog, Configurations configurations) {
+    String metastoreType =
+        configurations.get(SessionConfigOptions.catalogConnector(catalog)).toLowerCase();
+    return !metastoreType.equalsIgnoreCase(CatalogType.AMS.name());
+  }
+
   private boolean isExternalConnector(String catalog, Configurations configurations) {
     String connector =
         configurations

From 2402cd3db22b554a2e35aa48110cb1b12b8516a5 Mon Sep 17 00:00:00 2001
From: ZhouJinsong <zhoujinsong0505@163.com>
Date: Wed, 10 Jul 2024 15:31:58 +0800
Subject: [PATCH 09/25] [AMORO-3012] Exclude unnecessary artifacts for spark
 optimizer (#3013)

* Exclude not needed classes from spark optimizer

* Rollback unnecessary changes

* Add some guide for the class path error
---
 .../optimizer/common/OptimizerExecutor.java   |  3 +--
 .../amoro-optimizer-spark/pom.xml             | 11 ++++++++++
 .../spark/SparkOptimizerExecutor.java         |  8 +++++--
 .../amoro/io/AuthenticatedHadoopFileIO.java   |  1 -
 .../amoro/io/reader/StructLikeFunnel.java     |  8 +------
 .../apache/amoro/table/TableMetaStore.java    |  2 ++
 .../apache/amoro/utils/SerializationUtil.java | 22 ++++---------------
 docs/admin-guides/managing-optimizers.md      |  8 ++++++-
 8 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerExecutor.java b/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerExecutor.java
index 60fef24815..3e797f800e 100644
--- a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerExecutor.java
+++ b/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerExecutor.java
@@ -160,10 +160,9 @@ public static OptimizingTaskResult executeTask(
       return result;
     } catch (Throwable t) {
       logger.error(
-          "Optimizer executor[{}] executed task[{}]({}) failed and cost {}",
+          "Optimizer executor[{}] executed task[{}] failed and cost {}",
           threadId,
           task.getTaskId(),
-          input,
           System.currentTimeMillis() - startTime,
           t);
       OptimizingTaskResult errorResult = new OptimizingTaskResult(task.getTaskId(), threadId);
diff --git a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/pom.xml b/amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/pom.xml
index 1174214a4d..5116acf847 100644
--- a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/pom.xml
+++ b/amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/pom.xml
@@ -122,11 +122,22 @@
                         </goals>
                         <configuration>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <artifactSet>
+                                <excludes>
+                                    <exclude>org.slf4j:slf4j-api</exclude>
+                                    <exclude>org.apache.hadoop:*</exclude>
+                                    <exclude>org.apache.hive:*</exclude>
+                                </excludes>
+                            </artifactSet>
                             <relocations>
                                 <relocation>
                                     <pattern>org.apache.parquet</pattern>
                                     <shadedPattern>org.apache.amoro.shade.org.apache.parquet</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>org.apache.orc</pattern>
+                                    <shadedPattern>org.apache.amoro.shade.org.apache.orc</shadedPattern>
+                                </relocation>
                             </relocations>
                             <finalName>${project.artifactId}-${project.version}-jar-with-dependencies</finalName>
                         </configuration>
diff --git a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java b/amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java
index ce4499df12..b1cae14ad8 100644
--- a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java
+++ b/amoro-ams/amoro-ams-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java
@@ -52,8 +52,8 @@ public SparkOptimizerExecutor(JavaSparkContext jsc, OptimizerConfig config, int
   protected OptimizingTaskResult executeTask(OptimizingTask task) {
     OptimizingTaskResult result;
     String threadName = Thread.currentThread().getName();
+    long startTime = System.currentTimeMillis();
     try {
-      long startTime = System.currentTimeMillis();
       ImmutableList<OptimizingTask> of = ImmutableList.of(task);
       jsc.setJobDescription(jobDescription(task));
       SparkOptimizingTaskFunction taskFunction =
@@ -68,7 +68,11 @@ protected OptimizingTaskResult executeTask(OptimizingTask task) {
       return result;
     } catch (Throwable r) {
       LOG.error(
-          "Optimizer executor[{}] executed task[{}] failed, and cost {}", threadName, task, r);
+          "Optimizer executor[{}] executed task[{}] failed, and cost {}",
+          threadName,
+          task.getTaskId(),
+          (System.currentTimeMillis() - startTime),
+          r);
       result = new OptimizingTaskResult(task.getTaskId(), threadId);
       result.setErrorMessage(ExceptionUtil.getErrorMessage(r, 4000));
       return result;
diff --git a/amoro-core/src/main/java/org/apache/amoro/io/AuthenticatedHadoopFileIO.java b/amoro-core/src/main/java/org/apache/amoro/io/AuthenticatedHadoopFileIO.java
index d20599d277..face2daaf8 100644
--- a/amoro-core/src/main/java/org/apache/amoro/io/AuthenticatedHadoopFileIO.java
+++ b/amoro-core/src/main/java/org/apache/amoro/io/AuthenticatedHadoopFileIO.java
@@ -47,7 +47,6 @@ public class AuthenticatedHadoopFileIO extends HadoopFileIO
     implements AuthenticatedFileIO, SupportsPrefixOperations, SupportsFileSystemOperations {
 
   private final TableMetaStore tableMetaStore;
-  private boolean fileRecycleEnabled;
 
   AuthenticatedHadoopFileIO(TableMetaStore tableMetaStore) {
     super(tableMetaStore.getConfiguration());
diff --git a/amoro-core/src/main/java/org/apache/amoro/io/reader/StructLikeFunnel.java b/amoro-core/src/main/java/org/apache/amoro/io/reader/StructLikeFunnel.java
index cdc51910d6..e83106b28e 100644
--- a/amoro-core/src/main/java/org/apache/amoro/io/reader/StructLikeFunnel.java
+++ b/amoro-core/src/main/java/org/apache/amoro/io/reader/StructLikeFunnel.java
@@ -24,8 +24,6 @@
 import org.apache.iceberg.StructLike;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.IOException;
-
 public enum StructLikeFunnel implements Funnel<StructLike> {
   INSTANCE;
 
@@ -34,10 +32,6 @@ public enum StructLikeFunnel implements Funnel<StructLike> {
   @Override
   public void funnel(@NotNull StructLike structLike, PrimitiveSink primitiveSink) {
     StructLike copy = SerializationUtil.StructLikeCopy.copy(structLike);
-    try {
-      primitiveSink.putBytes(SerializationUtil.kryoSerialize(copy));
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
+    primitiveSink.putBytes(SerializationUtil.kryoSerialize(copy));
   }
 }
diff --git a/amoro-core/src/main/java/org/apache/amoro/table/TableMetaStore.java b/amoro-core/src/main/java/org/apache/amoro/table/TableMetaStore.java
index b3ab1793e3..ef022d328a 100644
--- a/amoro-core/src/main/java/org/apache/amoro/table/TableMetaStore.java
+++ b/amoro-core/src/main/java/org/apache/amoro/table/TableMetaStore.java
@@ -61,6 +61,8 @@
 
 /** Stores hadoop config files for {@link MixedTable} */
 public class TableMetaStore implements Serializable {
+  private static final long serialVersionUID = 1L;
+
   private static final Logger LOG = LoggerFactory.getLogger(TableMetaStore.class);
 
   // Share runtime context with same configuration as context is expensive to construct
diff --git a/amoro-core/src/main/java/org/apache/amoro/utils/SerializationUtil.java b/amoro-core/src/main/java/org/apache/amoro/utils/SerializationUtil.java
index 67752f19af..a1a662dc22 100644
--- a/amoro-core/src/main/java/org/apache/amoro/utils/SerializationUtil.java
+++ b/amoro-core/src/main/java/org/apache/amoro/utils/SerializationUtil.java
@@ -27,7 +27,6 @@
 import org.apache.avro.util.Utf8;
 import org.apache.iceberg.StructLike;
 import org.apache.iceberg.types.Types;
-import org.apache.iceberg.util.ByteBuffers;
 import org.apache.iceberg.util.StructLikeWrapper;
 import org.objenesis.strategy.StdInstantiatorStrategy;
 
@@ -57,11 +56,6 @@ public static ByteBuffer simpleSerialize(Object obj) {
     }
   }
 
-  public static <T> T simpleDeserialize(ByteBuffer buffer) {
-    byte[] bytes = ByteBuffers.toByteArray(buffer);
-    return simpleDeserialize(bytes);
-  }
-
   public static <T> T simpleDeserialize(byte[] bytes) {
     if (bytes == null) {
       return null;
@@ -75,7 +69,7 @@ public static <T> T simpleDeserialize(byte[] bytes) {
     }
   }
 
-  public static byte[] kryoSerialize(final Object obj) throws IOException {
+  public static byte[] kryoSerialize(final Object obj) {
     return KRYO_SERIALIZER.get().serialize(obj);
   }
 
@@ -185,11 +179,7 @@ public StructLikeWrapperSerializer(Types.StructType type) {
     public byte[] serialize(StructLikeWrapper structLikeWrapper) {
       checkNotNull(structLikeWrapper);
       StructLike copy = SerializationUtil.StructLikeCopy.copy(structLikeWrapper.get());
-      try {
-        return SerializationUtil.kryoSerialize(copy);
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
+      return SerializationUtil.kryoSerialize(copy);
     }
 
     @Override
@@ -208,12 +198,8 @@ public static class JavaSerializer<T extends Serializable> implements SimpleSeri
 
     @Override
     public byte[] serialize(T t) {
-      try {
-        checkNotNull(t);
-        return SerializationUtil.kryoSerialize(t);
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
+      checkNotNull(t);
+      return SerializationUtil.kryoSerialize(t);
     }
 
     @Override
diff --git a/docs/admin-guides/managing-optimizers.md b/docs/admin-guides/managing-optimizers.md
index 94d08ebbfa..2da26a9038 100644
--- a/docs/admin-guides/managing-optimizers.md
+++ b/docs/admin-guides/managing-optimizers.md
@@ -183,7 +183,13 @@ To better utilize the resources of Spark Optimizer, the DRA(Dynamic Resource All
 If you don't want this feature, you can use these settings:
 * Set `spark-conf.spark.dynamicAllocation.enabled` to `false` as you need allocate proper driver/executor resources Using [Spark Configuration Options](https://spark.apache.org/docs/latest/configuration.html).
 * Set `spark-conf.spark.dynamicAllocation.maxExecutors` to `10` as optimizer parallelism can only affect parallelism polling optimizing tasks from AMS.
-  {{< /hint >}}
+{{< /hint >}}
+
+{{< hint info >}}
+The spark optimizer may fail due to class conflicts sometimes, you can try to fix by following the steps below：
+* Set `spark-conf.spark.driver.userClassPathFirst` to `true`.
+* Set `spark-conf.spark.executor.userClassPathFirst` to `true`.
+{{< /hint >}}
 
 An example for yarn client mode:
 

From 2c83bbded52b36159a5d70fc0d0848df71c7007c Mon Sep 17 00:00:00 2001
From: ZhouJinsong <zhoujinsong0505@163.com>
Date: Wed, 10 Jul 2024 19:51:32 +0800
Subject: [PATCH 10/25] [Improvement] Make RocksDB dependency optional (#3018)

* Add enable-disk-storage profile to include rocksdb independent manually

* Improve some maven poms

* Change build guide

* Polish som poms

* Make support-disk-storage active by default

* Support disk storage by default, add no-extended-disk-storage profile
---
 .github/workflows/trino-ci.yml                |  4 +-
 README.md                                     |  3 +-
 amoro-ams/amoro-ams-server/pom.xml            | 40 ++++++++++++-------
 amoro-ams/dist/pom.xml                        |  5 ---
 amoro-core/pom.xml                            | 20 +++++-----
 .../amoro-mixed-format-trino/pom.xml          |  2 +-
 pom.xml                                       | 36 +++++++++++------
 tools/releasing/create_binary_release.sh      |  2 +-
 8 files changed, 65 insertions(+), 47 deletions(-)

diff --git a/.github/workflows/trino-ci.yml b/.github/workflows/trino-ci.yml
index 309842216e..b1238ffcd9 100644
--- a/.github/workflows/trino-ci.yml
+++ b/.github/workflows/trino-ci.yml
@@ -39,10 +39,10 @@ jobs:
           cache: maven
 
       - name: Validate checkstyle first
-        run: mvn validate -P trino-spotless
+        run: mvn validate -P format-mixed-format-trino
 
       - name: Build trino module with Maven
-        run: mvn clean install -pl 'amoro-mixed-format/amoro-mixed-format-trino' -am -B -P hadoop2,trino-spotless,build-mixed-format-trino
+        run: mvn clean install -pl 'amoro-mixed-format/amoro-mixed-format-trino' -am -B -P hadoop2,format-mixed-format-trino,build-mixed-format-trino
 
       - name: Code coverage
         uses: codecov/codecov-action@v3
diff --git a/README.md b/README.md
index 6416f03a5b..0748a8832f 100644
--- a/README.md
+++ b/README.md
@@ -115,11 +115,12 @@ Amoro is built using Maven with JDK 8 and JDK 17(only for `amoro-mixed-format/am
 * Build all modules without `amoro-mixed-format-trino`: `mvn clean package`
 * Build and skip tests: `mvn clean package -DskipTests`
 * Build and skip dashboard: `mvn clean package -Pskip-dashboard-build`
+* Build and support disk storage, RocksDB will be introduced to avoid memory overflow: `mvn clean package -DskipTests -Psupport-disk-storage`
 * Build with hadoop 2.x(the default is 3.x) dependencies: `mvn clean package -DskipTests -Phadoop2`
 * Specify Flink version for Flink optimizer(the default is 1.18.1): `mvn clean package -DskipTests -Dflink-optimizer.flink-version=1.15.4`
   * If the version of Flink is below 1.15.0, you also need to add the `-Pflink-optimizer-pre-1.15` parameter: `mvn clean package -DskipTests -Pflink-optimizer-pre-1.15 -Dflink-optimizer.flink-version=1.14.6`
 * Specify Spark version for Spark optimizer(the default is 3.3.3): `mvn clean package -DskipTests -Dspark-optimizer.spark-version=3.2.2`
-* Build `amoro-mixed-format-trino` module under JDK 17: `mvn clean package -DskipTests -Ptrino-spotless,build-mixed-format-trino -pl 'amoro-mixed-format/amoro-mixed-format-trino' -am`.
+* Build `amoro-mixed-format-trino` module under JDK 17: `mvn clean package -DskipTests -Pformat-mixed-format-trino,build-mixed-format-trino -pl 'amoro-mixed-format/amoro-mixed-format-trino' -am`.
 * Build all modules: `mvn clean package -DskipTests -Ptoolchain,build-mixed-format-trino`, besides you need config `toolchains.xml` in `${user.home}/.m2/` dir with content below.
 
 ```
diff --git a/amoro-ams/amoro-ams-server/pom.xml b/amoro-ams/amoro-ams-server/pom.xml
index 77e66a2c03..4e58dd9afc 100644
--- a/amoro-ams/amoro-ams-server/pom.xml
+++ b/amoro-ams/amoro-ams-server/pom.xml
@@ -96,6 +96,10 @@
                     <groupId>org.apache.zookeeper</groupId>
                     <artifactId>*</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.rocksdb</groupId>
+                    <artifactId>rocksdbjni</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -120,6 +124,10 @@
                     <groupId>org.apache.orc</groupId>
                     <artifactId>orc-mapreduce</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.rocksdb</groupId>
+                    <artifactId>rocksdbjni</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -209,26 +217,22 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
-            <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <scope>compile</scope>
         </dependency>
 
         <dependency>
             <!-- API bridge between log4j 1 and 2 -->
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-1.2-api</artifactId>
-            <scope>compile</scope>
         </dependency>
 
         <dependency>
@@ -273,14 +277,19 @@
         </dependency>
 
         <!-- flink dependencies -->
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-clients</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-runtime-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.flink</groupId>
+                    <artifactId>flink-rpc-akka-loader</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.flink</groupId>
+                    <artifactId>flink-shaded-zookeeper-3</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- runtime dependencies -->
@@ -292,21 +301,22 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.paimon</groupId>
-            <artifactId>paimon-spark-common</artifactId>
-            <version>${paimon.version}</version>
+            <groupId>org.apache.amoro</groupId>
+            <artifactId>amoro-optimizer-standalone</artifactId>
+            <version>${project.version}</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.paimon</groupId>
             <artifactId>paimon-s3</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.amoro</groupId>
-            <artifactId>amoro-optimizer-standalone</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.apache.paimon</groupId>
+            <artifactId>paimon-spark-common</artifactId>
+            <version>${paimon.version}</version>
             <scope>runtime</scope>
         </dependency>
 
diff --git a/amoro-ams/dist/pom.xml b/amoro-ams/dist/pom.xml
index fe6951a7b3..00a6ca3f9c 100644
--- a/amoro-ams/dist/pom.xml
+++ b/amoro-ams/dist/pom.xml
@@ -30,11 +30,6 @@
     <name>Amoro Project AMS Dist</name>
     <url>https://amoro.apache.org</url>
 
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.amoro</groupId>
diff --git a/amoro-core/pom.xml b/amoro-core/pom.xml
index ef5187e139..808a82fc64 100644
--- a/amoro-core/pom.xml
+++ b/amoro-core/pom.xml
@@ -69,11 +69,6 @@
             <artifactId>commons-pool2</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.rocksdb</groupId>
-            <artifactId>rocksdbjni</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.esotericsoftware</groupId>
             <artifactId>kryo</artifactId>
@@ -145,17 +140,22 @@
             <artifactId>RoaringBitmap</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-core</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.iceberg</groupId>
             <artifactId>iceberg-bundled-guava</artifactId>
             <version>${iceberg.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.rocksdb</groupId>
+            <artifactId>rocksdbjni</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-core</artifactId>
+        </dependency>
+
         <!-- test dependencies -->
         <dependency>
             <groupId>org.apache.iceberg</groupId>
diff --git a/amoro-mixed-format/amoro-mixed-format-trino/pom.xml b/amoro-mixed-format/amoro-mixed-format-trino/pom.xml
index 0991808cbf..9e6ce16869 100644
--- a/amoro-mixed-format/amoro-mixed-format-trino/pom.xml
+++ b/amoro-mixed-format/amoro-mixed-format-trino/pom.xml
@@ -655,7 +655,7 @@
             </build>
         </profile>
         <profile>
-            <id>trino-spotless</id>
+            <id>format-mixed-format-trino</id>
             <build>
                 <plugins>
                     <plugin>
diff --git a/pom.xml b/pom.xml
index ace21dddd5..b867e83e06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,6 +140,9 @@
         <amoro-shade-thrift.version>0.20.0</amoro-shade-thrift.version>
         <annotation-api.version>1.3.2</annotation-api.version>
         <guava.version>32.1.1-jre</guava.version>
+
+        <rocksdb-dependency-scope>compile</rocksdb-dependency-scope>
+        <lucene-dependency-scope>compile</lucene-dependency-scope>
     </properties>
 
     <dependencies>
@@ -490,18 +493,6 @@
                 <version>${awssdk.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient</artifactId>
-                <version>${prometheus.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.prometheus</groupId>
-                <artifactId>simpleclient_httpserver</artifactId>
-                <version>${prometheus.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>dynamodb</artifactId>
@@ -520,6 +511,18 @@
                 <version>${awssdk.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>io.prometheus</groupId>
+                <artifactId>simpleclient</artifactId>
+                <version>${prometheus.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.prometheus</groupId>
+                <artifactId>simpleclient_httpserver</artifactId>
+                <version>${prometheus.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>io.dropwizard.metrics</groupId>
                 <artifactId>metrics-core</artifactId>
@@ -614,6 +617,7 @@
                 <groupId>org.rocksdb</groupId>
                 <artifactId>rocksdbjni</artifactId>
                 <version>${rocksdb.version}</version>
+                <scope>${rocksdb-dependency-scope}</scope>
             </dependency>
 
             <dependency>
@@ -780,6 +784,7 @@
                 <groupId>org.apache.lucene</groupId>
                 <artifactId>lucene-core</artifactId>
                 <version>${lucene.version}</version>
+                <scope>${lucene-dependency-scope}</scope>
             </dependency>
 
             <!-- flink dependencies -->
@@ -1283,5 +1288,12 @@
                 <terminal.spark.major.version>3.2</terminal.spark.major.version>
             </properties>
         </profile>
+        <profile>
+            <id>no-extended-disk-storage</id>
+            <properties>
+                <rocksdb-dependency-scope>provided</rocksdb-dependency-scope>
+                <lucene-dependency-scope>provided</lucene-dependency-scope>
+            </properties>
+        </profile>
     </profiles>
 </project>
diff --git a/tools/releasing/create_binary_release.sh b/tools/releasing/create_binary_release.sh
index 74baf6ec4b..cad448d3c0 100644
--- a/tools/releasing/create_binary_release.sh
+++ b/tools/releasing/create_binary_release.sh
@@ -65,7 +65,7 @@ make_binary_release() {
   echo "Creating ${HADOOP_VERSION} binary release"
 
   # enable release profile here (to check for the maven version)
-  $MVN clean package ${HADOOP_PROFILE} -pl ':dist' -am -Dgpg.skip -Dcheckstyle.skip=true -DskipTests
+  $MVN clean package ${HADOOP_PROFILE} -Pno-extended-disk-storage -pl ':dist' -am -Dgpg.skip -Dcheckstyle.skip=true -DskipTests
 
   local TARGET_FILE="apache-amoro-${RELEASE_VERSION}-bin-${HADOOP_VERSION}.tar.gz"
   cp amoro-ams/dist/target/apache-amoro-${RELEASE_VERSION}-bin.tar.gz ${RELEASE_DIR}/${TARGET_FILE}

From 28cd1253d40e1283d1b4fbbc8dde74e2143bc4d1 Mon Sep 17 00:00:00 2001
From: chouchouji <70570907+chouchouji@users.noreply.github.com>
Date: Wed, 10 Jul 2024 19:51:56 +0800
Subject: [PATCH 11/25] [Improvement] set engines to prompt the lowest version
 of node and format code (#3017)

* [Improvement] format code

* chore: set engines

* docs: update node version
---
 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     |  2 +-
 .../src/components/Topbar.vue                 | 25 +++++++++---------
 .../views/optimize/components/ScaleOut.vue    | 12 ++++-----
 .../views/resource/components/GroupModal.vue  |  8 +++---
 .../src/views/terminal/index.vue              | 26 +++++++++----------
 8 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/amoro-ams/amoro-ams-dashboard/README.md b/amoro-ams/amoro-ams-dashboard/README.md
index 90ead6ef2c..eb01e6ed52 100644
--- a/amoro-ams/amoro-ams-dashboard/README.md
+++ b/amoro-ams/amoro-ams-dashboard/README.md
@@ -20,7 +20,7 @@ This is the Dashboard frontend for Amoro Management Service (AMS).
 
 ## Requirements
 
-- node >= `16.x`
+- node >= `18.18.0`
 - pnpm
 
 ## Installing Dependencies
diff --git a/amoro-ams/amoro-ams-dashboard/package.json b/amoro-ams/amoro-ams-dashboard/package.json
index b5c5c50988..f8a530e5c8 100644
--- a/amoro-ams/amoro-ams-dashboard/package.json
+++ b/amoro-ams/amoro-ams-dashboard/package.json
@@ -42,6 +42,9 @@
     "vite-plugin-svg-icons": "^2.0.1",
     "vue-tsc": "^2.0.21"
   },
+  "engines": {
+    "node": ">=18.18.0"
+  },
   "config": {
     "commitizen": {
       "path": "./node_modules/cz-conventional-changelog"
diff --git a/amoro-ams/amoro-ams-dashboard/pom.xml b/amoro-ams/amoro-ams-dashboard/pom.xml
index 9f25ee67e1..1a5e2fb20a 100644
--- a/amoro-ams/amoro-ams-dashboard/pom.xml
+++ b/amoro-ams/amoro-ams-dashboard/pom.xml
@@ -32,7 +32,7 @@
     <url>https://amoro.apache.org</url>
 
     <properties>
-        <node.version>v18.0.0</node.version>
+        <node.version>v18.18.0</node.version>
         <pnpm.version>8.15.5</pnpm.version>
         <maven-frontend-plugin.version>1.12.0</maven-frontend-plugin.version>
     </properties>
diff --git a/amoro-ams/amoro-ams-dashboard/src/App.vue b/amoro-ams/amoro-ams-dashboard/src/App.vue
index 4b0194fc51..9e06b4e2c9 100644
--- a/amoro-ams/amoro-ams-dashboard/src/App.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/App.vue
@@ -22,7 +22,7 @@ import enUS from 'ant-design-vue/es/locale/en_US'
 import dayjs from 'dayjs'
 import { watch } from 'vue'
 import { useI18n } from 'vue-i18n'
-import 'dayjs/locale/zh-cn';
+import 'dayjs/locale/zh-cn'
 
 const { locale } = useI18n()
 dayjs.locale('en')
diff --git a/amoro-ams/amoro-ams-dashboard/src/components/Topbar.vue b/amoro-ams/amoro-ams-dashboard/src/components/Topbar.vue
index dacdfd89fc..3e24f1a66b 100644
--- a/amoro-ams/amoro-ams-dashboard/src/components/Topbar.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/components/Topbar.vue
@@ -22,10 +22,10 @@ import { Modal } from 'ant-design-vue'
 import { useI18n } from 'vue-i18n'
 import { useRouter } from 'vue-router'
 
+import { DownOutlined, LogoutOutlined, QuestionCircleOutlined, TranslationOutlined } from '@ant-design/icons-vue'
 import useStore from '@/store'
 import { getVersionInfo } from '@/services/global.service'
 import loginService from '@/services/login.service'
-import { DownOutlined, QuestionCircleOutlined, LogoutOutlined, TranslationOutlined } from '@ant-design/icons-vue'
 
 interface IVersion {
   version: string
@@ -41,7 +41,7 @@ const { t, locale } = useI18n()
 const router = useRouter()
 const store = useStore()
 
-const getVersion = async () => {
+async function getVersion() {
   const res = await getVersionInfo()
   if (res) {
     verInfo.version = res.version
@@ -49,11 +49,11 @@ const getVersion = async () => {
   }
 }
 
-const goLoginPage = () => {
+function goLoginPage() {
   router.push({ path: '/login' })
 }
 
-const handleLogout = async () => {
+async function handleLogout() {
   Modal.confirm({
     title: t('logoutModalTitle'),
     onOk: async () => {
@@ -72,14 +72,15 @@ const handleLogout = async () => {
   })
 }
 
-const goDocs = () => {
+function goDocs() {
   window.open('https://amoro.apache.org/docs/latest/')
 }
 
-const setLocale = () => {
-  if(locale.value === 'zh') {
+function setLocale() {
+  if (locale.value === 'zh') {
     locale.value = 'en'
-  } else {
+  }
+  else {
     locale.value = 'zh'
   }
 }
@@ -96,17 +97,17 @@ onMounted(() => {
       <span class="g-mr-8">{{ `${$t('commitTime')}:  ${verInfo.commitTime}` }}</span>
     </div>
     <a-dropdown>
-      <span>{{ store.userInfo.userName}} <DownOutlined /></span>
+      <span>{{ store.userInfo.userName }} <DownOutlined /></span>
       <template #overlay>
         <a-menu>
           <a-menu-item key="userGuide" @click="goDocs">
-            <question-circle-outlined /> {{ $t('userGuide') }}
+            <QuestionCircleOutlined /> {{ $t('userGuide') }}
           </a-menu-item>
           <a-menu-item key="locale" @click="setLocale">
-            <translation-outlined /> {{ locale === 'zh' ? '切换至英文' : 'Switch To Chinese' }}
+            <TranslationOutlined /> {{ locale === 'zh' ? '切换至英文' : 'Switch To Chinese' }}
           </a-menu-item>
           <a-menu-item key="logout" @click="handleLogout">
-            <logout-outlined /> {{ $t('logout') }}
+            <LogoutOutlined /> {{ $t('logout') }}
           </a-menu-item>
         </a-menu>
       </template>
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/ScaleOut.vue b/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/ScaleOut.vue
index f9a1c93600..4badbde3e7 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/ScaleOut.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/optimize/components/ScaleOut.vue
@@ -85,12 +85,12 @@ onMounted(() => {
 </script>
 
 <template>
-  <AModal 
-    :open="props.visible" 
-    :title="$t('scaleOut')" 
-    :confirm-loading="confirmLoading" 
-    :closable="false" 
-    @ok="handleOk" 
+  <AModal
+    :open="props.visible"
+    :title="$t('scaleOut')"
+    :confirm-loading="confirmLoading"
+    :closable="false"
+    @ok="handleOk"
     @cancel="handleCancel"
   >
     <a-form ref="formRef" :model="formState" class="label-120">
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/resource/components/GroupModal.vue b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/GroupModal.vue
index 12469f3165..386a3f8cc7 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/resource/components/GroupModal.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/resource/components/GroupModal.vue
@@ -109,12 +109,12 @@ onMounted(() => {
 
 <template>
   <AModal
-    :open="true" 
-    :title="edit ? $t('editgroup') : $t('addgroup')" 
+    :open="true"
+    :title="edit ? $t('editgroup') : $t('addgroup')"
     :confirm-loading="confirmLoading"
     :closable="false"
-    class="group-modal" 
-    @ok="handleOk" 
+    class="group-modal"
+    @ok="handleOk"
     @cancel="handleCancel"
   >
     <a-form ref="formRef" :model="formState" class="label-120">
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/terminal/index.vue b/amoro-ams/amoro-ams-dashboard/src/views/terminal/index.vue
index 4b8af9845f..39cd3ffe11 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/terminal/index.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/terminal/index.vue
@@ -417,19 +417,19 @@ export default defineComponent({
       </div>
 
       <div v-if="runStatus" class="run-status" :style="{ background: bgcMap[runStatus] }">
-          <template v-if="runStatus === 'Running' || runStatus === 'Canceling'">
-            <loading-outlined style="color: #1890ff" />
-          </template>
-          <template v-if="runStatus === 'Canceled' || runStatus === 'Failed'">
-            <close-circle-outlined style="color: #ff4d4f" />
-          </template>
-          <template v-if="runStatus === 'Finished'">
-            <check-circle-outlined style="color: #52c41a" />
-          </template>
-          <template v-if="runStatus === 'Created'">
-            <close-circle-outlined style="color:#333" />
-          </template>
-          <span class="g-ml-12">{{ $t(runStatus) }}</span>
+        <template v-if="runStatus === 'Running' || runStatus === 'Canceling'">
+          <loading-outlined style="color: #1890ff" />
+        </template>
+        <template v-if="runStatus === 'Canceled' || runStatus === 'Failed'">
+          <close-circle-outlined style="color: #ff4d4f" />
+        </template>
+        <template v-if="runStatus === 'Finished'">
+          <check-circle-outlined style="color: #52c41a" />
+        </template>
+        <template v-if="runStatus === 'Created'">
+          <close-circle-outlined style="color:#333" />
+        </template>
+        <span class="g-ml-12">{{ $t(runStatus) }}</span>
       </div>
 
       <!-- sql result -->

From dcfbc364af5b5d454156ace0c34cda2c82a52dbe Mon Sep 17 00:00:00 2001
From: ConradJam <jam.gzczy@gmail.com>
Date: Wed, 10 Jul 2024 22:27:48 +0800
Subject: [PATCH 12/25] [AMORO-3021]: AMS First Time Async Load External
 Catalog Select OptimizingStatus Have NPE (#3021)  (#3022)

[AMORO-3021]: AMS First Time Async Load External Catalog Select OptimizingStatus Have NPE (#3021)

Co-authored-by: ConradJam <czy006@apache.com>
---
 .../dashboard/controller/TableController.java | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java
index 30c367f1fe..ae23a32b73 100644
--- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java
+++ b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/controller/TableController.java
@@ -57,6 +57,7 @@
 import org.apache.amoro.server.dashboard.response.PageResult;
 import org.apache.amoro.server.dashboard.utils.AmsUtil;
 import org.apache.amoro.server.dashboard.utils.CommonUtil;
+import org.apache.amoro.server.optimizing.OptimizingStatus;
 import org.apache.amoro.server.table.TableRuntime;
 import org.apache.amoro.server.table.TableService;
 import org.apache.amoro.shade.guava32.com.google.common.base.Function;
@@ -80,6 +81,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
@@ -137,13 +139,18 @@ public void getTableDetail(Context ctx) {
     ServerTableMeta serverTableMeta =
         tableDescriptor.getTableDetail(
             TableIdentifier.of(catalog, database, tableName).buildTableIdentifier());
-    ServerTableIdentifier serverTableIdentifier =
-        tableService.getServerTableIdentifier(
-            TableIdentifier.of(catalog, database, tableName).buildTableIdentifier());
     Map<String, Object> tableSummary = serverTableMeta.getTableSummary();
-    tableSummary.put(
-        "optimizingStatus", tableService.getRuntime(serverTableIdentifier).getOptimizingStatus());
-
+    Optional<ServerTableIdentifier> serverTableIdentifier =
+        Optional.ofNullable(
+            tableService.getServerTableIdentifier(
+                TableIdentifier.of(catalog, database, tableName).buildTableIdentifier()));
+    if (serverTableIdentifier.isPresent()) {
+      tableSummary.put(
+          "optimizingStatus",
+          tableService.getRuntime(serverTableIdentifier.get()).getOptimizingStatus());
+    } else {
+      tableSummary.put("optimizingStatus", OptimizingStatus.IDLE);
+    }
     ctx.json(OkResponse.of(serverTableMeta));
   }
 

From abc0b5d97da39a02cde83ac87e711d04bfb46387 Mon Sep 17 00:00:00 2001
From: xiaomo <wegi866@gmail.com>
Date: Thu, 11 Jul 2024 16:52:02 +0800
Subject: [PATCH 13/25] [AMORO-3023]: fix the search input (#3024)

---
 amoro-ams/amoro-ams-dashboard/mock/modules/catalogs.js    | 4 ++--
 .../src/components/tables-sub-menu/TablesMenu.vue         | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/amoro-ams/amoro-ams-dashboard/mock/modules/catalogs.js b/amoro-ams/amoro-ams-dashboard/mock/modules/catalogs.js
index 110fd99e95..746e218612 100644
--- a/amoro-ams/amoro-ams-dashboard/mock/modules/catalogs.js
+++ b/amoro-ams/amoro-ams-dashboard/mock/modules/catalogs.js
@@ -65,14 +65,14 @@ export default [
     url: '/mock/ams/v1/catalogs/test_catalog/databases',
     method: 'get',
     response: () => {
-      return { "message": "success", "code": 200, "result": ["db"] }
+      return { "message": "success", "code": 200, "result": ["db", "test", "acc"] }
     },
   },
   {
     url: '/mock/ams/v1/catalogs/test_catalog/databases/db/tables',
     method: 'get',
     response: () => {
-      return { "message": "success", "code": 200, "result": [{ "name": "user", "type": "ICEBERG" }] };
+      return { "message": "success", "code": 200, "result": [{ "name": "user", "type": "ICEBERG" },{ "name": "wf", "type": "ICEBERG" }, { "name": "xcvz", "type": "ICEBERG" }] };
     },
   },
   {
diff --git a/amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/TablesMenu.vue b/amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/TablesMenu.vue
index 7b0b744393..8fb2fa7034 100644
--- a/amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/TablesMenu.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/components/tables-sub-menu/TablesMenu.vue
@@ -105,13 +105,13 @@ export default defineComponent({
     function getSearchTableList() {
       debounce(() => {
         getAllTableList()
-      })
+      })()
     }
 
     function getSearchDBList() {
       debounce(() => {
         getAllDatabaseList(true)
-      })
+      })()
     }
 
     function handleClickDb(item: IDatabaseItem) {
@@ -308,7 +308,7 @@ export default defineComponent({
               v-model:value="DBSearchInput"
               :placeholder="placeholder.filterDBPh"
               class="theme-dark"
-              @change="() => handleSearch('db')"
+              @change="handleSearch('db')"
             >
               <template #prefix>
                 <SearchOutlined />
@@ -333,7 +333,7 @@ export default defineComponent({
               v-model:value="tableSearchInput"
               :placeholder="placeholder.filterTablePh"
               class="theme-dark"
-              @change="() => handleSearch('table')"
+              @change="handleSearch('table')"
             >
               <template #prefix>
                 <SearchOutlined />

From f1fbfa1e4de5b22b92eb9e0fbcce348dea0931ee Mon Sep 17 00:00:00 2001
From: ZhouJinsong <zhoujinsong0505@163.com>
Date: Thu, 11 Jul 2024 16:52:23 +0800
Subject: [PATCH 14/25] [Improvement] Unify the common parts of the dashboard
 API and the open API (#3014)

* Collect the api group for both dashboard and open api

* Improve the definition of the apis

* Improve signature checking logging message

* Remove debug log message printing
---
 .../mock/modules/catalogs.js                  |   2 +-
 .../src/services/setting.services.ts          |   2 +-
 .../server/dashboard/DashboardServer.java     | 386 +++++++-----------
 .../utils/ParamSignatureCalculator.java       |  15 +-
 .../exception/SignatureCheckException.java    |  13 +-
 5 files changed, 167 insertions(+), 251 deletions(-)

diff --git a/amoro-ams/amoro-ams-dashboard/mock/modules/catalogs.js b/amoro-ams/amoro-ams-dashboard/mock/modules/catalogs.js
index 746e218612..15623acf26 100644
--- a/amoro-ams/amoro-ams-dashboard/mock/modules/catalogs.js
+++ b/amoro-ams/amoro-ams-dashboard/mock/modules/catalogs.js
@@ -131,7 +131,7 @@ export default [
     response: () => ({ "message": "success", "code": 200, "result": true }),
   },
   {
-    url: '/mock/ams/v1/catalog/metastore/types',
+    url: '/mock/ams/v1/catalogs/metastore/types',
     method: 'get',
     response: () => ({
       "message": "success",
diff --git a/amoro-ams/amoro-ams-dashboard/src/services/setting.services.ts b/amoro-ams/amoro-ams-dashboard/src/services/setting.services.ts
index a22747d176..73d13f11c0 100644
--- a/amoro-ams/amoro-ams-dashboard/src/services/setting.services.ts
+++ b/amoro-ams/amoro-ams-dashboard/src/services/setting.services.ts
@@ -20,7 +20,7 @@ import type { IMap } from '@/types/common.type'
 import request from '@/utils/request'
 
 export function getCatalogsTypes() {
-  return request.get('ams/v1/catalog/metastore/types')
+  return request.get('ams/v1/catalogs/metastore/types')
 }
 export function getCatalogsSetting(catalogName: string) {
   return request.get(`ams/v1/catalogs/${catalogName}`)
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java
index 8d0f737893..c3b848c79d 100644
--- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java
+++ b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java
@@ -50,7 +50,7 @@
 import org.apache.amoro.server.exception.SignatureCheckException;
 import org.apache.amoro.server.table.TableService;
 import org.apache.amoro.server.terminal.TerminalManager;
-import org.apache.amoro.utils.JacksonUtil;
+import org.apache.amoro.shade.guava32.com.google.common.base.Preconditions;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -59,16 +59,20 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.Consumer;
 
 public class DashboardServer {
 
   public static final Logger LOG = LoggerFactory.getLogger(DashboardServer.class);
 
+  private static final String AUTH_TYPE_BASIC = "basic";
+
   private final CatalogController catalogController;
   private final HealthCheckController healthCheckController;
   private final LoginController loginController;
@@ -108,24 +112,29 @@ public DashboardServer(
   private String indexHtml = "";
 
   // read index.html content
-  public String getFileContent() throws IOException {
-    if ("".equals(indexHtml)) {
-      try (InputStream fileName =
-          DashboardServer.class.getClassLoader().getResourceAsStream("static/index.html")) {
-        try (InputStreamReader isr =
-                new InputStreamReader(fileName, StandardCharsets.UTF_8.newDecoder());
-            BufferedReader br = new BufferedReader(isr)) {
-          StringBuilder sb = new StringBuilder();
-          String line;
-          while ((line = br.readLine()) != null) {
-            // process the line
-            sb.append(line);
+  public String getIndexFileContent() {
+    try {
+      if ("".equals(indexHtml)) {
+        try (InputStream fileName =
+            DashboardServer.class.getClassLoader().getResourceAsStream("static/index.html")) {
+          Preconditions.checkNotNull(fileName, "Cannot find index file.");
+          try (InputStreamReader isr =
+                  new InputStreamReader(fileName, StandardCharsets.UTF_8.newDecoder());
+              BufferedReader br = new BufferedReader(isr)) {
+            StringBuilder sb = new StringBuilder();
+            String line;
+            while ((line = br.readLine()) != null) {
+              // process the line
+              sb.append(line);
+            }
+            indexHtml = sb.toString();
           }
-          indexHtml = sb.toString();
         }
       }
+      return indexHtml;
+    } catch (IOException e) {
+      throw new UncheckedIOException("Load index html filed", e);
     }
-    return indexHtml;
   }
 
   public Consumer<StaticFileConfig> configStaticFiles() {
@@ -153,25 +162,26 @@ public EndpointGroup endpoints() {
       path(
           "",
           () -> {
-            //  /docs/latest can't be located to the index.html, so we add rule to redirect to it.
-            get("/docs/latest", ctx -> ctx.redirect("/docs/latest/index.html"));
-            // unify all addSinglePageRoot(like /tables, /optimizers etc) configure here
+            // static files
             get(
                 "/{page}",
                 ctx -> {
                   String fileName = ctx.pathParam("page");
-                  if (fileName != null && fileName.endsWith("ico")) {
+                  if (fileName.endsWith("ico")) {
                     ctx.contentType(ContentType.IMAGE_ICO);
                     ctx.result(
-                        DashboardServer.class
-                            .getClassLoader()
-                            .getResourceAsStream("static/" + fileName));
+                        Objects.requireNonNull(
+                            DashboardServer.class
+                                .getClassLoader()
+                                .getResourceAsStream("static/" + fileName)));
                   } else {
-                    ctx.html(getFileContent());
+                    ctx.html(getIndexFileContent());
                   }
                 });
-            get("/hive-tables/upgrade", ctx -> ctx.html(getFileContent()));
+            get("/hive-tables/upgrade", ctx -> ctx.html(getIndexFileContent()));
           });
+
+      // for dashboard api
       path(
           "/ams/v1",
           () -> {
@@ -179,268 +189,179 @@ public EndpointGroup endpoints() {
             get("/login/current", loginController::getCurrent);
             post("/login", loginController::login);
             post("/logout", loginController::logout);
+          });
+      path("ams/v1", apiGroup());
+
+      // for open api
+      path("/api/ams/v1", apiGroup());
+    };
+  }
 
-            // table controller
+  private EndpointGroup apiGroup() {
+    return () -> {
+      // table apis
+      path(
+          "/tables",
+          () -> {
             get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/details",
+                "/catalogs/{catalog}/dbs/{db}/tables/{table}/details",
                 tableController::getTableDetail);
             get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/hive/details",
+                "/catalogs/{catalog}/dbs/{db}/tables/{table}/hive/details",
                 tableController::getHiveTableDetail);
             post(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/upgrade",
+                "/catalogs/{catalog}/dbs/{db}/tables/{table}/upgrade",
                 tableController::upgradeHiveTable);
             get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/upgrade/status",
+                "/catalogs/{catalog}/dbs/{db}/tables/{table}/upgrade/status",
                 tableController::getUpgradeStatus);
-            get("/upgrade/properties", tableController::getUpgradeHiveTableProperties);
             get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/optimizing-processes",
+                "/catalogs/{catalog}/dbs/{db}/tables/{table}/optimizing-processes",
                 tableController::getOptimizingProcesses);
             get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/optimizing-processes/{processId}/tasks",
+                "/catalogs/{catalog}/dbs/{db}/tables/{table}/optimizing-processes/{processId}/tasks",
                 tableController::getOptimizingProcessTasks);
             get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/snapshots",
+                "/catalogs/{catalog}/dbs/{db}/tables/{table}/snapshots",
                 tableController::getTableSnapshots);
             get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/snapshots/{snapshotId}/detail",
+                "/catalogs/{catalog}/dbs/{db}/tables/{table}/snapshots/{snapshotId}/detail",
                 tableController::getSnapshotDetail);
             get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/partitions",
+                "/catalogs/{catalog}/dbs/{db}/tables/{table}/partitions",
                 tableController::getTablePartitions);
             get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/partitions/{partition}/files",
+                "/catalogs/{catalog}/dbs/{db}/tables/{table}/partitions/{partition}/files",
                 tableController::getPartitionFileListInfo);
             get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/operations",
+                "/catalogs/{catalog}/dbs/{db}/tables/{table}/operations",
                 tableController::getTableOperations);
-            get("/catalogs/{catalog}/databases/{db}/tables", tableController::getTableList);
-            get("/catalogs/{catalog}/databases", tableController::getDatabaseList);
-            get("/catalogs", tableController::getCatalogs);
-            get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/tags",
-                tableController::getTableTags);
+            get("/catalogs/{catalog}/dbs/{db}/tables/{table}/tags", tableController::getTableTags);
             get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/branches",
+                "/catalogs/{catalog}/dbs/{db}/tables/{table}/branches",
                 tableController::getTableBranches);
             post(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/optimizing-processes/{processId}/cancel",
+                "/catalogs/{catalog}/dbs/{db}/tables/{table}/optimizing-processes/{processId}/cancel",
                 tableController::cancelOptimizingProcess);
+          });
+      get("/upgrade/properties", tableController::getUpgradeHiveTableProperties);
 
-            // catalog controller
-            post("/catalogs", catalogController::createCatalog);
-            // make sure types is before
-            get("/catalogs/types", catalogController::getCatalogTypeList);
-            get("/catalog/metastore/types", catalogController::getCatalogTypeList);
+      // catalog apis
+      path(
+          "/catalogs",
+          () -> {
+            get("/{catalog}/databases/{db}/tables", tableController::getTableList);
+            get("/{catalog}/databases", tableController::getDatabaseList);
+            get("", tableController::getCatalogs);
+            post("", catalogController::createCatalog);
+            get("metastore/types", catalogController::getCatalogTypeList);
+            get("/{catalogName}", catalogController::getCatalogDetail);
+            delete("/{catalogName}", catalogController::deleteCatalog);
+            put("/{catalogName}", catalogController::updateCatalog);
+            get("/{catalogName}/delete/check", catalogController::catalogDeleteCheck);
+            get("/{catalogName}/config/{type}/{key}", catalogController::getCatalogConfFileContent);
+          });
 
-            get("/catalogs/{catalogName}", catalogController::getCatalogDetail);
-            delete("/catalogs/{catalogName}", catalogController::deleteCatalog);
-            put("/catalogs/{catalogName}", catalogController::updateCatalog);
-            get("/catalogs/{catalogName}/delete/check", catalogController::catalogDeleteCheck);
-            get(
-                "/catalogs/{catalogName}/config/{type}/{key}",
-                catalogController::getCatalogConfFileContent);
-            // optimize controller
+      // optimizing api
+      path(
+          "/optimize",
+          () -> {
             get(
-                "/optimize/optimizerGroups/{optimizerGroup}/tables",
+                "/optimizerGroups/{optimizerGroup}/tables",
                 optimizerController::getOptimizerTables);
+            get("/optimizerGroups/{optimizerGroup}/optimizers", optimizerController::getOptimizers);
+            get("/optimizerGroups", optimizerController::getOptimizerGroups);
             get(
-                "/optimize/optimizerGroups/{optimizerGroup}/optimizers",
-                optimizerController::getOptimizers);
-            get("/optimize/optimizerGroups", optimizerController::getOptimizerGroups);
-            get(
-                "/optimize/optimizerGroups/{optimizerGroup}/info",
+                "/optimizerGroups/{optimizerGroup}/info",
                 optimizerController::getOptimizerGroupInfo);
             delete(
-                "/optimize/optimizerGroups/{optimizerGroup}/optimizers/{jobId}",
+                "/optimizerGroups/{optimizerGroup}/optimizers/{jobId}",
                 optimizerController::releaseOptimizer);
             post(
-                "/optimize/optimizerGroups/{optimizerGroup}/optimizers",
+                "/optimizerGroups/{optimizerGroup}/optimizers",
                 optimizerController::scaleOutOptimizer);
-            get("/optimize/resourceGroups", optimizerController::getResourceGroup);
-            post("/optimize/resourceGroups", optimizerController::createResourceGroup);
-            put("/optimize/resourceGroups", optimizerController::updateResourceGroup);
-            delete(
-                "/optimize/resourceGroups/{resourceGroupName}",
-                optimizerController::deleteResourceGroup);
+            get("/resourceGroups", optimizerController::getResourceGroup);
+            post("/resourceGroups", optimizerController::createResourceGroup);
+            put("/resourceGroups", optimizerController::updateResourceGroup);
+            delete("/resourceGroups/{resourceGroupName}", optimizerController::deleteResourceGroup);
             get(
-                "/optimize/resourceGroups/{resourceGroupName}/delete/check",
+                "/resourceGroups/{resourceGroupName}/delete/check",
                 optimizerController::deleteCheckResourceGroup);
-            get("/optimize/containers/get", optimizerController::getContainers);
-
-            // console controller
-            get("/terminal/examples", terminalController::getExamples);
-            get("/terminal/examples/{exampleName}", terminalController::getSqlExamples);
-            post("/terminal/catalogs/{catalog}/execute", terminalController::executeScript);
-            get("/terminal/{sessionId}/logs", terminalController::getLogs);
-            get("/terminal/{sessionId}/result", terminalController::getSqlResult);
-            put("/terminal/{sessionId}/stop", terminalController::stopSql);
-            get("/terminal/latestInfos/", terminalController::getLatestInfo);
-
-            // file controller
-            post("/files", platformFileInfoController::uploadFile);
-            get("/files/{fileId}", platformFileInfoController::downloadFile);
-
-            // setting controller
-            get("/settings/containers", settingController::getContainerSetting);
-            get("/settings/system", settingController::getSystemSetting);
-
-            // health check
-            get("/health/status", healthCheckController::healthCheck);
-
-            // version controller
-            get("/versionInfo", versionController::getVersionInfo);
+            get("/containers/get", optimizerController::getContainers);
           });
-      // for open api
+
+      // console apis
       path(
-          "/api/ams/v1",
+          "/terminal",
           () -> {
+            get("/examples", terminalController::getExamples);
+            get("/examples/{exampleName}", terminalController::getSqlExamples);
+            post("/catalogs/{catalog}/execute", terminalController::executeScript);
+            get("/{sessionId}/logs", terminalController::getLogs);
+            get("/{sessionId}/result", terminalController::getSqlResult);
+            put("/{sessionId}/stop", terminalController::stopSql);
+            get("/latestInfos/", terminalController::getLatestInfo);
+          });
 
-            // table controller
-            get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/details",
-                tableController::getTableDetail);
-            get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/hive/details",
-                tableController::getHiveTableDetail);
-            post(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/upgrade",
-                tableController::upgradeHiveTable);
-            get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/upgrade/status",
-                tableController::getUpgradeStatus);
-            get("/upgrade/properties", tableController::getUpgradeHiveTableProperties);
-            get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/optimizing-processes",
-                tableController::getOptimizingProcesses);
-            post(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/optimizing-processes/{processId}/cancel",
-                tableController::cancelOptimizingProcess);
-            get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/optimizing-processes/{processId}/tasks",
-                tableController::getOptimizingProcessTasks);
-            get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/snapshots",
-                tableController::getTableSnapshots);
-            get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/snapshots/{snapshotId}/detail",
-                tableController::getSnapshotDetail);
-            get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/partitions",
-                tableController::getTablePartitions);
-            get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/partitions/{partition}/files",
-                tableController::getPartitionFileListInfo);
-            get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/operations",
-                tableController::getTableOperations);
-            get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/signature",
-                tableController::getTableDetailTabToken);
-            get("/catalogs/{catalog}/databases/{db}/tables", tableController::getTableList);
-            get("/catalogs/{catalog}/databases", tableController::getDatabaseList);
-            get("/catalogs", tableController::getCatalogs);
-            get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/tags",
-                tableController::getTableTags);
-            get(
-                "/tables/catalogs/{catalog}/dbs/{db}/tables/{table}/branches",
-                tableController::getTableBranches);
+      // file apis
+      path(
+          "/files",
+          () -> {
+            post("", platformFileInfoController::uploadFile);
+            get("/{fileId}", platformFileInfoController::downloadFile);
+          });
 
-            // optimize controller
-            get(
-                "/optimize/optimizerGroups/{optimizerGroup}/tables",
-                optimizerController::getOptimizerTables);
-            get(
-                "/optimize/optimizerGroups/{optimizerGroup}/optimizers",
-                optimizerController::getOptimizers);
-            get("/optimize/optimizerGroups", optimizerController::getOptimizerGroups);
-            get(
-                "/optimize/optimizerGroups/{optimizerGroup}/info",
-                optimizerController::getOptimizerGroupInfo);
-            delete(
-                "/optimize/optimizerGroups/{optimizerGroup}/optimizers/{jobId}",
-                optimizerController::releaseOptimizer);
-            post(
-                "/optimize/optimizerGroups/{optimizerGroup}/optimizers",
-                optimizerController::scaleOutOptimizer);
-            get("/optimize/resourceGroups", optimizerController::getResourceGroup);
-            post("/optimize/resourceGroups", optimizerController::createResourceGroup);
-            put("/optimize/resourceGroups", optimizerController::updateResourceGroup);
-            delete(
-                "/optimize/resourceGroups/{resourceGroupName}",
-                optimizerController::deleteResourceGroup);
-            get(
-                "/optimize/resourceGroups/{resourceGroupName}/delete/check",
-                optimizerController::deleteCheckResourceGroup);
-            get("/optimize/containers/get", optimizerController::getContainers);
-
-            // console controller
-            get("/terminal/examples", terminalController::getExamples);
-            get("/terminal/examples/{exampleName}", terminalController::getSqlExamples);
-            post("/terminal/catalogs/{catalog}/execute", terminalController::executeScript);
-            get("/terminal/{sessionId}/logs", terminalController::getLogs);
-            get("/terminal/{sessionId}/result", terminalController::getSqlResult);
-            put("/terminal/{sessionId}/stop", terminalController::stopSql);
-            get("/terminal/latestInfos/", terminalController::getLatestInfo);
-
-            // health check
-            get("/health/status", healthCheckController::healthCheck);
-
-            // version controller
-            get("/versionInfo", versionController::getVersionInfo);
+      // setting apis
+      path(
+          "/settings",
+          () -> {
+            get("/containers", settingController::getContainerSetting);
+            get("/system", settingController::getSystemSetting);
           });
+
+      // health api
+      get("/health/status", healthCheckController::healthCheck);
+
+      // version api
+      get("/versionInfo", versionController::getVersionInfo);
     };
   }
 
   public void preHandleRequest(Context ctx) {
     String uriPath = ctx.path();
     if (needApiKeyCheck(uriPath)) {
-      if ("basic".equalsIgnoreCase(authType)) {
+      if (AUTH_TYPE_BASIC.equalsIgnoreCase(authType)) {
         BasicAuthCredentials cred = ctx.basicAuthCredentials();
         if (!(basicAuthUser.equals(cred.component1())
             && basicAuthPassword.equals(cred.component2()))) {
-          LOG.debug(
-              String.format(
-                  "Failed to authenticate via basic authentication.  Request url: %s %s.",
-                  ctx.req.getMethod(), uriPath));
-          throw new SignatureCheckException();
+          throw new SignatureCheckException(
+              "Failed to authenticate via basic authentication for url:" + uriPath);
         }
       } else {
         checkApiToken(
-            ctx.method(),
-            ctx.url(),
-            ctx.queryParam("apiKey"),
-            ctx.queryParam("signature"),
-            ctx.queryParamMap());
+            ctx.url(), ctx.queryParam("apiKey"), ctx.queryParam("signature"), ctx.queryParamMap());
       }
     } else if (needLoginCheck(uriPath)) {
       if (null == ctx.sessionAttribute("user")) {
-        LOG.info("session info: {}", JacksonUtil.toJSONString(ctx.sessionAttributeMap()));
-        throw new ForbiddenException();
+        throw new ForbiddenException("User session attribute is missed for url: " + uriPath);
       }
     }
   }
 
   public void handleException(Exception e, Context ctx) {
     if (e instanceof ForbiddenException) {
-      try {
-        // request doesn't start with /ams is  page request. we return index.html
-        if (!ctx.req.getRequestURI().startsWith("/ams")) {
-          ctx.html(getFileContent());
-        } else {
-          ctx.json(new ErrorResponse(HttpCode.FORBIDDEN, "need login before request", ""));
-        }
-      } catch (Exception fe) {
-        LOG.error("Failed to handle request", fe);
+      // request doesn't start with /ams is  page request. we return index.html
+      if (!ctx.req.getRequestURI().startsWith("/ams")) {
+        ctx.html(getIndexFileContent());
+      } else {
+        ctx.json(new ErrorResponse(HttpCode.FORBIDDEN, "Please login first", ""));
       }
     } else if (e instanceof SignatureCheckException) {
-      ctx.json(new ErrorResponse(HttpCode.FORBIDDEN, "Signature Exception  before request", ""));
+      ctx.json(new ErrorResponse(HttpCode.FORBIDDEN, "Signature check failed", ""));
     } else {
-      LOG.error("Failed to handle request", e);
       ctx.json(new ErrorResponse(HttpCode.INTERNAL_SERVER_ERROR, e.getMessage(), ""));
     }
+    LOG.error("An error occurred while processing the url:{}", ctx.url(), e);
   }
 
   private static final String[] urlWhiteList = {
@@ -482,22 +403,16 @@ private boolean needApiKeyCheck(String uri) {
   }
 
   private void checkApiToken(
-      String requestMethod,
-      String requestUrl,
-      String apiKey,
-      String signature,
-      Map<String, List<String>> params) {
+      String requestUrl, String apiKey, String signature, Map<String, List<String>> params) {
     String plainText;
     String encryptString;
     String signCal;
-    LOG.debug("[{}] url: {}, ", requestMethod, requestUrl);
 
-    long receive = System.currentTimeMillis();
     APITokenManager apiTokenService = new APITokenManager();
     try {
-      String secrete = apiTokenService.getSecretByKey(apiKey);
+      String secret = apiTokenService.getSecretByKey(apiKey);
 
-      if (secrete == null) {
+      if (secret == null) {
         throw new SignatureCheckException();
       }
 
@@ -516,27 +431,24 @@ private void checkApiToken(
         encryptString = paramString;
       }
 
-      plainText = String.format("%s%s%s", apiKey, encryptString, secrete);
+      plainText = String.format("%s%s%s", apiKey, encryptString, secret);
       signCal = ParamSignatureCalculator.getMD5(plainText);
-      LOG.info(
-          "calculate:  plainText:{}, signCal:{}, signFromRequest: {}",
+      LOG.debug(
+          "Calculated signature for url:{}, plain text:{}, calculated signature:{}, signature in request: {}",
+          requestUrl,
           plainText,
           signCal,
           signature);
 
       if (!signature.equals(signCal)) {
-        LOG.error(String.format("Signature Check Failed!!, req:%s, cal:%s", signature, signCal));
-        throw new SignatureCheckException();
+        throw new SignatureCheckException(
+            String.format(
+                "Check signature for url:%s failed,"
+                    + " calculated signature:%s, signature in request:%s",
+                requestUrl, signCal, signature));
       }
     } catch (Exception e) {
-      LOG.error("api doFilter error.", e);
-      throw new SignatureCheckException();
-    } finally {
-      LOG.debug(
-          "[finish] in {} ms, [{}] {}",
-          System.currentTimeMillis() - receive,
-          requestMethod,
-          requestUrl);
+      throw new SignatureCheckException("Check url signature failed", e);
     }
   }
 }
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/ParamSignatureCalculator.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/ParamSignatureCalculator.java
index f1f3683375..0d4b5799d3 100644
--- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/ParamSignatureCalculator.java
+++ b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/utils/ParamSignatureCalculator.java
@@ -51,7 +51,7 @@ public static String getMD5(byte[] bytes) {
         str[k++] = hexDigits[byte0 & 0xf];
       }
     } catch (Exception e) {
-      LOG.error("failed", e);
+      throw new RuntimeException("Calculate md5 value failed", e);
     }
     return new String(str);
   }
@@ -63,13 +63,7 @@ public static String getMD5(byte[] bytes) {
    * @return the MD5 hash of the given value as a string
    */
   public static String getMD5(String value) {
-    String result = "";
-    try {
-      result = getMD5(value.getBytes(StandardCharsets.UTF_8));
-    } catch (Exception e) {
-      LOG.error("get MD5 Error!!", e);
-    }
-    return result;
+    return getMD5(value.getBytes(StandardCharsets.UTF_8));
   }
 
   /**
@@ -95,8 +89,7 @@ public static String generateParamStringWithValueList(Map<String, List<String>>
                     ? ""
                     : entry.getKey() + URLDecoder.decode(sortedValues.get(0), "utf-8");
               } catch (UnsupportedEncodingException e) {
-                LOG.error("Failed to calculate signature", e);
-                return null;
+                throw new RuntimeException("Calculate signature failed", e);
               }
             })
         .collect(Collectors.joining());
@@ -120,7 +113,7 @@ public static String generateParamStringWithValue(Map<String, String> map) {
                 try {
                   return key + URLDecoder.decode(map.get(key), "UTF-8");
                 } catch (UnsupportedEncodingException e) {
-                  LOG.error("Failed to decode url value: {}", map.get(key), e);
+                  throw new RuntimeException("Calculate signature failed", e);
                 }
               }
               return null;
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/SignatureCheckException.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/SignatureCheckException.java
index 9c238b2bc9..3dd53034ec 100644
--- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/SignatureCheckException.java
+++ b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/exception/SignatureCheckException.java
@@ -19,4 +19,15 @@
 package org.apache.amoro.server.exception;
 
 /** SignatureCheckException */
-public class SignatureCheckException extends AmoroRuntimeException {}
+public class SignatureCheckException extends AmoroRuntimeException {
+
+  public SignatureCheckException() {}
+
+  public SignatureCheckException(String message) {
+    super(message);
+  }
+
+  public SignatureCheckException(String message, Throwable throwable) {
+    super(message, throwable);
+  }
+}

From f68a1403e97ce295f326f270aed74bb78886ec04 Mon Sep 17 00:00:00 2001
From: chouchouji <70570907+chouchouji@users.noreply.github.com>
Date: Fri, 12 Jul 2024 10:30:34 +0800
Subject: [PATCH 15/25] [AMORO-2444] Fix the problem that the y-axis content is
 too long  (#3026)

[AMORO-2444] fix the problem that the y-axis content is too long to be displayed
---
 amoro-ams/amoro-ams-dashboard/src/components/Layout.vue         | 1 -
 amoro-ams/amoro-ams-dashboard/src/utils/chart.ts                | 2 ++
 .../src/views/tables/components/Snapshots.vue                   | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/amoro-ams/amoro-ams-dashboard/src/components/Layout.vue b/amoro-ams/amoro-ams-dashboard/src/components/Layout.vue
index 994a6dac38..04bf83e43c 100644
--- a/amoro-ams/amoro-ams-dashboard/src/components/Layout.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/components/Layout.vue
@@ -68,7 +68,6 @@ export default defineComponent({
     transition: width 0.3s;
     overflow: auto;
     .content {
-      // padding: 16px 24px;
       height: calc(100% - 48px);
       overflow: auto;
     }
diff --git a/amoro-ams/amoro-ams-dashboard/src/utils/chart.ts b/amoro-ams/amoro-ams-dashboard/src/utils/chart.ts
index beb95586c6..0fdcaf292a 100644
--- a/amoro-ams/amoro-ams-dashboard/src/utils/chart.ts
+++ b/amoro-ams/amoro-ams-dashboard/src/utils/chart.ts
@@ -67,6 +67,8 @@ export function generateLineChartOption(titleText: string, data: ILineChartOrigi
     grid: {
       top: 40,
       bottom: 50,
+      left: '1%',
+      containLabel: true,
     },
   }
   titleText && (option.title = {
diff --git a/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Snapshots.vue b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Snapshots.vue
index dccbc409ce..978048d271 100644
--- a/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Snapshots.vue
+++ b/amoro-ams/amoro-ams-dashboard/src/views/tables/components/Snapshots.vue
@@ -41,7 +41,6 @@ const columns: IColumns[] = shallowReactive([
 const breadcrumbColumns = shallowReactive([
   { title: t('operation'), dataIndex: 'operation', width: 120, ellipsis: true },
   { title: t('file'), dataIndex: 'file', ellipsis: true },
-  // { title: t('fsn'), dataIndex: 'fsn' },
   { title: t('partition'), dataIndex: 'partition', width: 120 },
   { title: t('fileType'), dataIndex: 'fileType', width: 120, ellipsis: true },
   { title: t('size'), dataIndex: 'size', width: 120 },
@@ -172,7 +171,6 @@ function toggleBreadcrumb(record: SnapshotItem) {
 
 onMounted(() => {
   hasBreadcrumb.value = false
-  // getTableInfo()
 })
 </script>
 

From 9b3318d3e88582169c561f62c14e3cea11a08bd7 Mon Sep 17 00:00:00 2001
From: ZhouJinsong <zhoujinsong0505@163.com>
Date: Fri, 12 Jul 2024 15:17:58 +0800
Subject: [PATCH 16/25] [AMORO-3029] Fix table record calculating with empty
 table (#3030)

Fix table record calculating with empty table
---
 .../server/dashboard/DashboardServer.java     |  1 +
 .../MixedAndIcebergTableDescriptor.java       | 28 +++++++++++--------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java
index c3b848c79d..6d8c984071 100644
--- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java
+++ b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java
@@ -368,6 +368,7 @@ public void handleException(Exception e, Context ctx) {
     "/ams/v1/versionInfo",
     "/ams/v1/login",
     "/ams/v1/health/status",
+    "/ams/v1/login/current",
     "/",
     "/overview",
     "/introduce",
diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java
index bc456a0d6d..4434304f09 100644
--- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java
+++ b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java
@@ -176,23 +176,29 @@ private String decorateTableFormat(AmoroTable table) {
   }
 
   private long getRecordsOfTable(MixedTable mixedTable) {
-    long totalRecords;
+    long totalRecords = 0L;
     if (mixedTable.isKeyedTable()) {
       Snapshot changeSnapshot =
           SnapshotUtil.latestSnapshot(mixedTable.asKeyedTable().changeTable(), null);
       Snapshot baseSnapshot =
           SnapshotUtil.latestSnapshot(mixedTable.asKeyedTable().baseTable(), null);
-      totalRecords =
-          PropertyUtil.propertyAsLong(
-                  changeSnapshot.summary(), SnapshotSummary.TOTAL_RECORDS_PROP, 0L)
-              + PropertyUtil.propertyAsLong(
-                  baseSnapshot.summary(), SnapshotSummary.TOTAL_RECORDS_PROP, 0L);
+      if (changeSnapshot != null) {
+        totalRecords +=
+            PropertyUtil.propertyAsLong(
+                changeSnapshot.summary(), SnapshotSummary.TOTAL_RECORDS_PROP, 0L);
+      }
+      if (baseSnapshot != null) {
+        totalRecords +=
+            PropertyUtil.propertyAsLong(
+                baseSnapshot.summary(), SnapshotSummary.TOTAL_RECORDS_PROP, 0L);
+      }
     } else {
-      totalRecords =
-          PropertyUtil.propertyAsLong(
-              SnapshotUtil.latestSnapshot(mixedTable.asUnkeyedTable(), null).summary(),
-              SnapshotSummary.TOTAL_RECORDS_PROP,
-              0L);
+      Snapshot latestSnapshot = SnapshotUtil.latestSnapshot(mixedTable.asUnkeyedTable(), null);
+      if (latestSnapshot != null) {
+        totalRecords =
+            PropertyUtil.propertyAsLong(
+                latestSnapshot.summary(), SnapshotSummary.TOTAL_RECORDS_PROP, 0L);
+      }
     }
     return totalRecords;
   }

From 13e271110ebee87d52af57840a6b8be61f18f3a2 Mon Sep 17 00:00:00 2001
From: Xie Yi <105206850+xieyi888@users.noreply.github.com>
Date: Mon, 15 Jul 2024 15:58:23 +0800
Subject: [PATCH 17/25] [AMORO-3033]IndexOutOfBoundsException when start up AMS
 during selectProcessInputFiles  because of no optimizing process_id (#3034)

fix IndexOutOfBoundsException when start ams
---
 .../apache/amoro/server/persistence/TaskFilesPersistence.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/TaskFilesPersistence.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/TaskFilesPersistence.java
index 9e8f040aa6..5bbba3abdd 100644
--- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/TaskFilesPersistence.java
+++ b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/persistence/TaskFilesPersistence.java
@@ -46,7 +46,7 @@ public static Map<Integer, RewriteFilesInput> loadTaskInputs(long processId) {
     List<byte[]> bytes =
         persistence.getAs(
             OptimizingMapper.class, mapper -> mapper.selectProcessInputFiles(processId));
-    if (bytes == null) {
+    if (bytes == null || bytes.isEmpty()) {
       return Collections.emptyMap();
     } else {
       return SerializationUtil.simpleDeserialize(CompressUtil.unGzip(bytes.get(0)));

From 42fe1993821aaa3a4f80f0e4fa3af932b290776d Mon Sep 17 00:00:00 2001
From: ZhouJinsong <zhoujinsong0505@163.com>
Date: Mon, 15 Jul 2024 20:16:31 +0800
Subject: [PATCH 18/25] [Hotfix] Fix build guide in README.md (#3037)

Fix build guide
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0748a8832f..b06093c2ba 100644
--- a/README.md
+++ b/README.md
@@ -115,7 +115,7 @@ Amoro is built using Maven with JDK 8 and JDK 17(only for `amoro-mixed-format/am
 * Build all modules without `amoro-mixed-format-trino`: `mvn clean package`
 * Build and skip tests: `mvn clean package -DskipTests`
 * Build and skip dashboard: `mvn clean package -Pskip-dashboard-build`
-* Build and support disk storage, RocksDB will be introduced to avoid memory overflow: `mvn clean package -DskipTests -Psupport-disk-storage`
+* Build and disable disk storage, RocksDB will NOT be introduced to avoid memory overflow: `mvn clean package -DskipTests -Pno-extented-disk-storage`
 * Build with hadoop 2.x(the default is 3.x) dependencies: `mvn clean package -DskipTests -Phadoop2`
 * Specify Flink version for Flink optimizer(the default is 1.18.1): `mvn clean package -DskipTests -Dflink-optimizer.flink-version=1.15.4`
   * If the version of Flink is below 1.15.0, you also need to add the `-Pflink-optimizer-pre-1.15` parameter: `mvn clean package -DskipTests -Pflink-optimizer-pre-1.15 -Dflink-optimizer.flink-version=1.14.6`

From a12f2984f4c0fd2017e98a7c89ba7457edb65d85 Mon Sep 17 00:00:00 2001
From: Zhengke Zhou <madzhou1@gmail.com>
Date: Tue, 16 Jul 2024 12:03:49 +0800
Subject: [PATCH 19/25] [AMORO-2787]: Remove `memorySize` option (#3040)

remove `memorySize` option

Co-authored-by: ZhouJinsong <zhoujinsong0505@163.com>
---
 .../org/apache/amoro/optimizer/common/OptimizerConfig.java  | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerConfig.java b/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerConfig.java
index 152eb2b162..d800216ca0 100644
--- a/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerConfig.java
+++ b/amoro-ams/amoro-ams-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerConfig.java
@@ -43,12 +43,6 @@ public class OptimizerConfig implements Serializable {
       required = true)
   private int executionParallel;
 
-  /** @deprecated This parameter is deprecated and will be removed in version 0.7.0. */
-  @Deprecated
-  @Option(
-      name = "-m",
-      aliases = "--" + OptimizerProperties.OPTIMIZER_MEMORY_SIZE,
-      usage = "Optimizer memory size(MB)")
   private int memorySize;
 
   @Option(

From 58d1f6cd37b16534b50601572c0187787bab21e7 Mon Sep 17 00:00:00 2001
From: feng xiaohang <43104233+engraving-knife@users.noreply.github.com>
Date: Tue, 16 Jul 2024 12:05:36 +0800
Subject: [PATCH 20/25] Optimize database configuration for mysql5.6. (#2961)

* Optimize database configuration for mysql5.6.

* Update amoro-ams/amoro-ams-server/src/main/resources/mysql/ams-mysql-init.sql

Co-authored-by: ZhouJinsong <zhoujinsong0505@163.com>

---------

Co-authored-by: xiaosefeng <xiaosefeng@tencent.com>
Co-authored-by: ZhouJinsong <zhoujinsong0505@163.com>
Co-authored-by: ConradJam <jam.gzczy@gmail.com>
---
 .../main/resources/mysql/ams-mysql-init.sql   |  6 +--
 .../mysql/upgrade-0.4.0-to-0.4.1.sql          |  2 +-
 .../mysql/upgrade-0.4.1-to-0.5.0.sql          |  4 +-
 .../dist/src/main/amoro-bin/conf/config.yaml  | 42 +++++++++----------
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/amoro-ams/amoro-ams-server/src/main/resources/mysql/ams-mysql-init.sql b/amoro-ams/amoro-ams-server/src/main/resources/mysql/ams-mysql-init.sql
index ce2c88ad34..82fe7072d3 100644
--- a/amoro-ams/amoro-ams-server/src/main/resources/mysql/ams-mysql-init.sql
+++ b/amoro-ams/amoro-ams-server/src/main/resources/mysql/ams-mysql-init.sql
@@ -82,7 +82,7 @@ CREATE TABLE `table_identifier`
     `format`          VARCHAR(32)  NOT NULL COMMENT 'Table Format',
     PRIMARY KEY (`table_id`),
     UNIQUE KEY `table_name_index` (`catalog_name`,`db_name`,`table_name`)
-);
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT 'Table identifier for AMS' ROW_FORMAT=DYNAMIC;
 
 CREATE TABLE `table_metadata`
 (
@@ -131,7 +131,7 @@ CREATE TABLE `table_runtime`
     `pending_input`                 mediumtext,
     PRIMARY KEY (`table_id`),
     UNIQUE KEY `table_index` (`catalog_name`,`db_name`,`table_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT 'Optimize running information of each table';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT 'Optimize running information of each table' ROW_FORMAT=DYNAMIC;
 
 CREATE TABLE `table_optimizing_process`
 (
@@ -221,4 +221,4 @@ CREATE TABLE `table_blocker` (
   `properties` mediumtext COMMENT 'Blocker properties',
   PRIMARY KEY (`blocker_id`),
   KEY `table_index` (`catalog_name`,`db_name`,`table_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Table blockers';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Table blockers' ROW_FORMAT=DYNAMIC;
diff --git a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.0-to-0.4.1.sql b/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.0-to-0.4.1.sql
index 609499e114..c4d705d860 100644
--- a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.0-to-0.4.1.sql
+++ b/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.0-to-0.4.1.sql
@@ -24,7 +24,7 @@ CREATE TABLE `table_blocker` (
   `properties` mediumtext COMMENT 'Blocker properties',
   PRIMARY KEY (`blocker_id`),
   KEY `table_index` (`catalog_name`,`db_name`,`table_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Table blockers';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Table blockers' ROW_FORMAT=DYNAMIC;
 
 ALTER TABLE `optimize_group` ADD COLUMN `scheduling_policy`   varchar(20) COMMENT 'Optimize group scheduling policy' after `name`;
 ALTER TABLE `optimize_task` CHANGE `max_change_transaction_id` `to_sequence` bigint(20) NOT NULL DEFAULT '-1' COMMENT 'to sequence';
diff --git a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.1-to-0.5.0.sql b/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.1-to-0.5.0.sql
index 89292b95bb..f293d19587 100644
--- a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.1-to-0.5.0.sql
+++ b/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.1-to-0.5.0.sql
@@ -59,7 +59,7 @@ CREATE TABLE `table_identifier`
     `table_name`      varchar(128) NOT NULL COMMENT 'Table name',
     PRIMARY KEY (`table_id`),
     UNIQUE KEY `table_name_index` (`catalog_name`,`db_name`,`table_name`)
-);
+) ROW_FORMAT=DYNAMIC;
 INSERT INTO `table_identifier` (`catalog_name`, `db_name`, `table_name`) SELECT `catalog_name`, `db_name`, `table_name` FROM `table_metadata`;
 
 -- table_metadata
@@ -126,7 +126,7 @@ CREATE TABLE `table_runtime`
     `optimizing_config`             mediumtext,
     `pending_input`                 mediumtext,
     PRIMARY KEY (`table_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT 'Optimize running information of each table';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT 'Optimize running information of each table' ROW_FORMAT=DYNAMIC;
 
 
 
diff --git a/amoro-ams/dist/src/main/amoro-bin/conf/config.yaml b/amoro-ams/dist/src/main/amoro-bin/conf/config.yaml
index 9402ab2fb1..cdea700842 100644
--- a/amoro-ams/dist/src/main/amoro-bin/conf/config.yaml
+++ b/amoro-ams/dist/src/main/amoro-bin/conf/config.yaml
@@ -92,27 +92,27 @@ ams:
     connection-pool-max-idle: 16
     connection-pool-max-wait-millis: 1000
 
-#    MySQL database configuration.
-#    database:
-#      type: mysql
-#      jdbc-driver-class: com.mysql.cj.jdbc.Driver
-#      url: jdbc:mysql://127.0.0.1:3306/db?useUnicode=true&characterEncoding=UTF8&autoReconnect=true&useAffectedRows=true&allowPublicKeyRetrieval=true&useSSL=false
-#      username: root
-#      password: root
-#      connection-pool-max-total: 20
-#      connection-pool-max-idle: 16
-#      connection-pool-max-wait-millis: 1000
-
-  #  Postgres database configuration.
-  #  database:
-  #    type: postgres
-  #    jdbc-driver-class: org.postgresql.Driver
-  #    url: jdbc:postgresql://127.0.0.1:5432/db
-  #    username: user
-  #    password: passwd
-  #    connection-pool-max-total: 20
-  #    connection-pool-max-idle: 16
-  #    connection-pool-max-wait-millis: 1000
+#  MySQL database configuration.
+#  database:
+#    type: mysql
+#    jdbc-driver-class: com.mysql.cj.jdbc.Driver
+#    url: jdbc:mysql://127.0.0.1:3306/db?useUnicode=true&characterEncoding=UTF8&autoReconnect=true&useAffectedRows=true&allowPublicKeyRetrieval=true&useSSL=false
+#    username: root
+#    password: root
+#    connection-pool-max-total: 20
+#    connection-pool-max-idle: 16
+#    connection-pool-max-wait-millis: 1000
+
+#  Postgres database configuration.
+#  database:
+#    type: postgres
+#    jdbc-driver-class: org.postgresql.Driver
+#    url: jdbc:postgresql://127.0.0.1:5432/db
+#    username: user
+#    password: passwd
+#    connection-pool-max-total: 20
+#    connection-pool-max-idle: 16
+#    connection-pool-max-wait-millis: 1000
 
   terminal:
     backend: local

From 4f6a1d348917323a20aff1747a7215fe8f434c90 Mon Sep 17 00:00:00 2001
From: Qishang Zhong <zhongqishang@gmail.com>
Date: Tue, 16 Jul 2024 17:55:18 +0800
Subject: [PATCH 21/25] [AMORO-3041] Config failOnNoGitDirectory and
 failOnUnableToExtractRepoInfo to false for git-commit-id-plugin (#3042)

---
 amoro-ams/amoro-ams-server/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/amoro-ams/amoro-ams-server/pom.xml b/amoro-ams/amoro-ams-server/pom.xml
index 4e58dd9afc..c5f16766fe 100644
--- a/amoro-ams/amoro-ams-server/pom.xml
+++ b/amoro-ams/amoro-ams-server/pom.xml
@@ -387,6 +387,8 @@
                     </execution>
                 </executions>
                 <configuration>
+                    <failOnNoGitDirectory>false</failOnNoGitDirectory>
+                    <failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
                     <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
                     <generateGitPropertiesFile>true</generateGitPropertiesFile>
                     <generateGitPropertiesFilename>

From 7856711566ec9eb1d3ec64820fe2986117dc1afc Mon Sep 17 00:00:00 2001
From: ZhouJinsong <zhoujinsong0505@163.com>
Date: Tue, 16 Jul 2024 19:37:03 +0800
Subject: [PATCH 22/25] [AMORO-3043] Change source release file suffix to
 `tar.gz` (#3044)

Change source release file suffix to tar.gz
---
 tools/releasing/create_source_release.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/releasing/create_source_release.sh b/tools/releasing/create_source_release.sh
index fd4a2cc3e8..ffb86a0fe5 100644
--- a/tools/releasing/create_source_release.sh
+++ b/tools/releasing/create_source_release.sh
@@ -68,10 +68,10 @@ rsync -a \
   --exclude "*/dependency-reduced-pom.xml" \
   . amoro-$RELEASE_VERSION
 
-tar czf ${RELEASE_DIR}/apache-amoro-${RELEASE_VERSION}-src.tgz amoro-$RELEASE_VERSION
-gpg --armor --detach-sig ${RELEASE_DIR}/apache-amoro-$RELEASE_VERSION-src.tgz
+tar czf ${RELEASE_DIR}/apache-amoro-${RELEASE_VERSION}-src.tar.gz amoro-$RELEASE_VERSION
+gpg --armor --detach-sig ${RELEASE_DIR}/apache-amoro-$RELEASE_VERSION-src.tar.gz
 cd ${RELEASE_DIR}
-$SHASUM apache-amoro-$RELEASE_VERSION-src.tgz > apache-amoro-$RELEASE_VERSION-src.tgz.sha512
+$SHASUM apache-amoro-$RELEASE_VERSION-src.tar.gz > apache-amoro-$RELEASE_VERSION-src.tar.gz.sha512
 
 cd ${CURR_DIR}
 rm -rf ${CLONE_DIR}
\ No newline at end of file

From bac3fb6b3613a7ea9c1076d05ca6f9237f600072 Mon Sep 17 00:00:00 2001
From: ZhouJinsong <zhoujinsong0505@163.com>
Date: Tue, 16 Jul 2024 19:58:19 +0800
Subject: [PATCH 23/25] [Hotfix] Fix liveness and readiness uri for amoro
 deployment (#3045)

Fix liveness and readiness path for amoro deployment
---
 charts/amoro/templates/amoro-deployment.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/amoro/templates/amoro-deployment.yaml b/charts/amoro/templates/amoro-deployment.yaml
index da9397b719..bce9dc1bb0 100644
--- a/charts/amoro/templates/amoro-deployment.yaml
+++ b/charts/amoro/templates/amoro-deployment.yaml
@@ -83,7 +83,7 @@ spec: {{/* TODO If Support Replica can be use more than 1 */}}
           {{- if .Values.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
-              path: /health/status
+              path: /ams/v1/health/status
               port: rest
             initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
@@ -94,7 +94,7 @@ spec: {{/* TODO If Support Replica can be use more than 1 */}}
           {{- if .Values.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
-              path: /versionInfo
+              path: ams/v1/versionInfo
               port: rest
             initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.readinessProbe.periodSeconds }}

From 688c6912a8644184fe1b2703f007c0edd14bfbff Mon Sep 17 00:00:00 2001
From: baiyangtx <xiangnebula@163.com>
Date: Wed, 17 Jul 2024 11:13:34 +0800
Subject: [PATCH 24/25] [Improvement] Add test-jar goal for maven-jar-plugin
 (#3046)

add test-jar goal for jar-plugin
---
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index b867e83e06..e648586ab6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1216,6 +1216,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>

From 1db63a65488040ad74e6d957e89caff93c7bd88d Mon Sep 17 00:00:00 2001
From: Paul Lin <paullin3280@gmail.com>
Date: Fri, 19 Jul 2024 13:54:50 +0800
Subject: [PATCH 25/25] [Hotfix] Fix wrong javadoc for
 TableRuntimeRefreshExecutor (#3051)

Fix wrong javadoc for TableRuntimeRefreshExecutor
---
 .../server/table/executor/TableRuntimeRefreshExecutor.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/TableRuntimeRefreshExecutor.java b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/TableRuntimeRefreshExecutor.java
index 484c03f466..7837537ede 100644
--- a/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/TableRuntimeRefreshExecutor.java
+++ b/amoro-ams/amoro-ams-server/src/main/java/org/apache/amoro/server/table/executor/TableRuntimeRefreshExecutor.java
@@ -26,7 +26,7 @@
 import org.apache.amoro.server.table.TableRuntime;
 import org.apache.amoro.table.MixedTable;
 
-/** Service for expiring tables periodically. */
+/** Executor that refreshes table runtimes and evaluates optimizing status periodically. */
 public class TableRuntimeRefreshExecutor extends BaseTableExecutor {
 
   // 1 minutes