Merge branch 'master' into table-detail

.github/workflows/core-hadoop2-ci.yml

@@ -44,7 +44,7 @@ jobs:
         run: mvn validate
 
       - name: Build all module with Maven
-        run: mvn clean install -Djacoco.flink.skip=true -B -ntp -Dhadoop=v2
+        run: mvn clean install -Djacoco.flink.skip=true -B -ntp -Phadoop2
 
       - name: Code coverage
         uses: codecov/codecov-action@v3

.github/workflows/docker-images.yml

@@ -40,7 +40,7 @@ jobs:
     if: ${{ startsWith(github.repository, 'apache/') }}
     strategy:
       matrix:
-        hadoop: [ "v3" ]
+        hadoop: [ "v2", "v3" ]
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK 8
@@ -65,7 +65,6 @@ jobs:
             name=apache/amoro
           tags: |
             type=ref,event=branch,enable=${{ matrix.hadoop == 'v3' }},suffix=-snapshot
-            type=ref,event=branch,enable=${{ matrix.hadoop == 'v3' }},suffix=-snapshot-hadoop3
             type=ref,event=branch,enable=${{ matrix.hadoop == 'v2' }},suffix=-snapshot-hadoop2
             type=semver,event=tag,enable=${{ matrix.hadoop == 'v3' }},pattern={{version}}
             type=semver,event=tag,enable=${{ matrix.hadoop == 'v2' }},pattern={{version}}-hadoop2
@@ -80,12 +79,12 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Set Maven Build Properties
-        if: ${{ matrix.hadoop != 'v3' }}
+        if: ${{ matrix.hadoop == 'v2' }}
         run: |
-          echo "MVN_HADOOP=-Dhadoop=${{ matrix.hadoop }}" >> $GITHUB_ENV
+          echo "MVN_HADOOP=-Phadoop2" >> $GITHUB_ENV
 
       - name: Build dist module with Maven
-        run: mvn clean install -pl 'amoro-ams/dist' -am -e ${MVN_HADOOP} -DskipTests -B -ntp
+        run: mvn clean package -pl 'amoro-ams/dist' -am -e ${MVN_HADOOP} -DskipTests -B -ntp
 
       - name: Build and Push Amoro Docker Image
         uses: docker/build-push-action@v4

.github/workflows/trino-ci.yml

@@ -42,7 +42,7 @@ jobs:
         run: mvn validate -P trino-spotless
 
       - name: Build trino module with Maven
-        run: mvn clean install -pl 'amoro-mixed-format/amoro-mixed-format-trino' -Dhadoop=v2 -am -B -P trino-spotless,build-mixed-format-trino
+        run: mvn clean install -pl 'amoro-mixed-format/amoro-mixed-format-trino' -am -B -P hadoop2,trino-spotless,build-mixed-format-trino
 
       - name: Code coverage
         uses: codecov/codecov-action@v3

LICENSE

@@ -1,4 +1,3 @@
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -199,6 +198,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
-
---------------------------------------------------------------------------------
+   limitations under the License.

NOTICE-binary

@@ -0,0 +1,79 @@
+// ------------------------------------------------------------------
+// NOTICE file corresponding to the section 4d of The Apache License,
+// Version 2.0, in this case for Apache Amoro
+// ------------------------------------------------------------------
+
+Apache Amoro (incubating)
+Copyright 2024 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Apache Iceberg
+Copyright 2017-2024 The Apache Software Foundation
+
+Apache Paimon
+Copyright 2023-2024 The Apache Software Foundation
+
+Apache Flink
+Copyright 2014-2024 The Apache Software Foundation
+
+Apache Spark
+Copyright 2014-2024 The Apache Software Foundation
+
+Apache Hive
+Copyright 2008-2024 The Apache Software Foundation
+
+Apache Hadoop
+Copyright 2006-2024 The Apache Software Foundation
+
+Apache Thrift
+Copyright (C) 2006 - 2024, The Apache Software Foundation
+
+Apache HttpClient
+Copyright 1999-2024 The Apache Software Foundation
+
+Apache HttpComponents Core HTTP/2
+Copyright 2005-2024 The Apache Software Foundation
+
+Apache HttpComponents Core HTTP/1.1
+Copyright 2005-2024 The Apache Software Foundation
+
+Apache Commons Lang
+Copyright 2001-2024 The Apache Software Foundation
+
+Apache Arrow
+Copyright 2022-2024 The Apache Software Foundation
+
+Apache Yetus - Audience Annotations
+Copyright 2015-2024 The Apache Software Foundation
+
+Apache Avro
+Copyright 2009-2024 The Apache Software Foundation
+
+Curator Framework
+Copyright 2011-2024 The Apache Software Foundation
+
+Curator Recipes
+Copyright 2011-2024 The Apache Software Foundation
+
+Curator Client
+Copyright 2011-2024 The Apache Software Foundation
+
+Apache Derby
+Copyright 2004-2024 The Apache Software Foundation
+
+Apache Hive
+Copyright 2018-2024 The Apache Software Foundation
+
+Apache HttpClient
+Copyright 1999-2024 The Apache Software Foundation
+
+Apache Ivy (TM)
+Copyright 2007-2024 The Apache Software Foundation
+
+Objenesis
+Copyright 2006-2024 Joe Walnes, Henri Tremblay, Leonardo Mesquita
+
+ORC Shims
+Copyright 2013-2024 The Apache Software Foundation

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 with hadoop 2.x(the default is 3.x) dependencies: `mvn clean package -DskipTests -Dhadoop=v2`
+* 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`

amoro-ams/amoro-ams-dashboard/src/components/Sidebar.vue

@@ -180,7 +180,7 @@ export default defineComponent({
         <template #icon>
           <svg-icon :icon-class="item.icon" class="svg-icon" />
         </template>
-        <span>{{ $t(item.title) }}</span>
+        <span>{{ item.title }}</span>
       </a-menu-item>
     </a-menu>
     <a-button type="link" class="toggle-btn" @click="toggleCollapsed">

amoro-ams/amoro-ams-dashboard/src/components/Topbar.vue

@@ -20,6 +20,7 @@
 import { defineComponent, onMounted, reactive } from 'vue'
 import { Modal } from 'ant-design-vue'
 import { useI18n } from 'vue-i18n'
+import { useRouter } from 'vue-router'
 
 import useStore from '@/store'
 import { getVersionInfo } from '@/services/global.service'
@@ -38,7 +39,8 @@ export default defineComponent ({
       commitTime: '',
     })
 
-    const { t } = useI18n()
+    const { t, locale } = useI18n()
+    const router = useRouter()
 
     const getVersion = async () => {
       const res = await getVersionInfo()
@@ -48,12 +50,15 @@ export default defineComponent ({
       }
     }
 
+    const goLoginPage = () => {
+      router.push({ path: '/login' })
+    }
+
     const handleLogout = async () => {
       Modal.confirm({
         title: t('logoutModalTitle'),
-        content: '',
-        okText: '',
-        cancelText: '',
+        okText: t('confirm'),
+        cancelText: t('cancel'),
         onOk: async () => {
           try {
             await loginService.logout()
@@ -65,7 +70,7 @@ export default defineComponent ({
             store.updateUserInfo({
               userName: '',
             })
-            window.location.href = '/login'
+            goLoginPage()
           }
         },
       })
@@ -75,6 +80,12 @@ export default defineComponent ({
       window.open('https://amoro.apache.org/docs/latest/')
     }
 
+    const setLocale = ({ key }: { key: string }) => {
+      if(locale.value !== key) {
+        locale.value = key
+      }
+    };
+
     onMounted(() => {
       getVersion()
     })
@@ -83,6 +94,7 @@ export default defineComponent ({
       verInfo,
       goDocs,
       handleLogout,
+      setLocale,
     }
   },
 })
@@ -100,6 +112,15 @@ export default defineComponent ({
       </template>
       <question-circle-outlined class="question-icon" @click="goDocs" />
     </a-tooltip>
+    <a-dropdown>
+      <TranslationOutlined class="g-ml-8" />
+      <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>
+      </template>
+    </a-dropdown>
     <a-tooltip>
       <template #title>
         {{ $t('logout') }}
@@ -132,7 +153,7 @@ export default defineComponent ({
     font-size: 12px;
   }
   .logout-button.ant-btn {
-      border: none;
+    border: none;
   }
   .logout-button:hover {
     border-color: unset;

amoro-ams/amoro-ams-dashboard/src/language/en.ts

@@ -134,6 +134,7 @@ export default {
   ready: 'Ready',
   running: 'Running',
   cancel: 'Cancel',
+  confirm: 'Confirm',
   cancelProcess: 'Cancel Process',
   finish: 'Finish',
   fail: 'Fail',
@@ -201,4 +202,7 @@ export default {
   filterBranchesOrTags: 'Filter branches/tags',
   findATag: 'Find a tag',
   fileSearchPlaceholder: 'Filter partitions',
+  noResourceGroupsTitle: 'No resource groups available.',
+  noResourceGroupsContent: 'Please create an optimizer group first.',
+  goToButtonText: 'Go',
 }

amoro-ams/amoro-ams-dashboard/src/language/zh.ts

@@ -134,6 +134,7 @@ export default {
   ready: '就绪',
   running: '运行中',
   cancel: '取消',
+  confirm: '确认',
   cancelProcess: '取消进程',
   finish: '完成',
   fail: '失败',
@@ -171,7 +172,7 @@ export default {
   remove: '移除',
   edit: '编辑',
   deleteCatalogModalTitle: '移除此目录？',
-  cannotDeleteModalTitle: "不能移除这个目录",
+  cannotDeleteModalTitle: '不能移除这个目录',
   cannotDeleteModalContent: '这个目录已被使用',
   success: '成功',
   optimzeGroup: '优化组',
@@ -182,7 +183,7 @@ export default {
   invalidInput: '非法输入',
   addgroup: '添加组',
   editgroup: '编辑组',
-  cannotDeleteGroupModalTitle: "不能移除这个组",
+  cannotDeleteGroupModalTitle: '不能移除这个组',
   cannotDeleteGroupModalContent: '这个组已被使用',
   deleteGroupModalTitle: '移除这个组',
   processId: '进程 ID',
@@ -200,6 +201,8 @@ export default {
   nothingToShow: '无内容可展示',
   filterBranchesOrTags: '过滤分支/标签',
   findATag: '查找标签',
-  fileSearchPlaceholder: '过滤分区'
+  fileSearchPlaceholder: '过滤分区',
+  noResourceGroupsTitle: '没有任何优化组',
+  noResourceGroupsContent: '需要首先创建一个默认优化组',
+  goToButtonText: '前往',
 }
-

amoro-ams/amoro-ams-dashboard/src/services/optimize.service.ts

@@ -25,12 +25,14 @@ export function getOptimizerGroups() {
 export function getOptimizerTableList(
   params: {
     optimizerGroup: string
+    dbSearchInput: string
+    tableSearchInput: string
     page: number
     pageSize: number
   },
 ) {
-  const { optimizerGroup, page, pageSize } = params
-  return request.get(`ams/v1/optimize/optimizerGroups/${optimizerGroup}/tables`, { params: { page, pageSize } })
+  const { optimizerGroup, dbSearchInput, tableSearchInput, page, pageSize } = params
+  return request.get(`ams/v1/optimize/optimizerGroups/${optimizerGroup}/tables`, { params: { dbSearchInput, tableSearchInput, page, pageSize } })
 }
 
 export function getOptimizerResourceList(