Merge branch 'master' into unified-iceberg

apache · Dec 14, 2023 · 127b235 · 127b235
2 parents ad9adb7 + 62ea8d2
commit 127b235
Show file tree

Hide file tree

Showing 77 changed files with 927 additions and 490 deletions.
diff --git a/...netease/arctic/ams/api/PropertyNames.java → ...e/arctic/ams/api/OptimizerProperties.java b/...netease/arctic/ams/api/PropertyNames.java → ...e/arctic/ams/api/OptimizerProperties.java
@@ -1,12 +1,16 @@
 package com.netease.arctic.ams.api;
 
-public class PropertyNames {
+public class OptimizerProperties {
 
+  // Resource properties
   public static final String RESOURCE_ID = "resource-id";
-  public static final String EXPORT_PROPERTY_PREFIX = "export.";
-
   public static final String AMS_OPTIMIZER_URI = "ams-optimizing-uri";
   public static final String AMS_HOME = "ams-home";
+
+  // Resource container properties
+  public static final String EXPORT_PROPERTY_PREFIX = "export.";
+
+  // Resource group properties
   public static final String OPTIMIZER_EXECUTION_PARALLEL = "execution-parallel";
   public static final String OPTIMIZER_MEMORY_SIZE = "memory-size";
   public static final String OPTIMIZER_GROUP_NAME = "group-name";
@@ -15,4 +19,6 @@ public class PropertyNames {
   public static final boolean OPTIMIZER_EXTEND_DISK_STORAGE_DEFAULT = false;
   public static final String OPTIMIZER_DISK_STORAGE_PATH = "disk-storage-path";
   public static final String OPTIMIZER_MEMORY_STORAGE_SIZE = "memory-storage-size";
+  public static final String MAX_INPUT_FILE_SIZE_PER_THREAD = "max-input-file-size-per-thread";
+  public static final Long MAX_INPUT_FILE_SIZE_PER_THREAD_DEFAULT = 512 * 1024 * 1024L; // 512MB
 }
diff --git a/ams/api/src/main/java/com/netease/arctic/ams/api/properties/CatalogMetaProperties.java b/ams/api/src/main/java/com/netease/arctic/ams/api/properties/CatalogMetaProperties.java
@@ -48,13 +48,8 @@ public class CatalogMetaProperties {
   // Deprecated from version v0.4.0, use KEY_WAREHOUSE
   @Deprecated public static final String KEY_WAREHOUSE_DIR = "warehouse.dir";
   public static final String KEY_WAREHOUSE = "warehouse";
-  /**
-   * @deprecated since 0.6.0, will be removed in 0.7.0; use {@link
-   *     CatalogMetaProperties#KEY_TABLE_FILTER} instead.
-   */
-  @Deprecated
-  public static final String KEY_DATABASE_FILTER_REGULAR_EXPRESSION =
-      "database.filter-regular-expression";
+
+  public static final String KEY_DATABASE_FILTER = "database-filter";
 
   public static final String KEY_TABLE_FILTER = "table-filter";
 

diff --git a/ams/dashboard/src/components/tables-sub-menu/TablesMenu.vue b/ams/dashboard/src/components/tables-sub-menu/TablesMenu.vue
@@ -240,7 +240,8 @@ export default defineComponent({
         }))
         if (state.databaseList.length && !isSearch) {
           const index = state.databaseList.findIndex(ele => ele.id === storageCataDBTable.database)
-          state.database = index > -1 ? storageCataDBTable.database : (route.query?.db)?.toString() || state.databaseList[0].id || ''
+          // ISSUE 2413: If the current catalog is not the one in the query, the first db is selected by default.
+          state.database = index > -1 ? storageCataDBTable.database : state.curCatalog === (route.query?.catalog)?.toString() ? ((route.query?.db)?.toString() || state.databaseList[0].id || '') : state.databaseList[0].id || ''
           getAllTableList()
         }
       }).finally(() => {

diff --git a/ams/dashboard/src/language/en.ts b/ams/dashboard/src/language/en.ts
@@ -72,6 +72,7 @@ export default {
   filterPlaceholder: 'Filter {inputPh}',
   basicInformation: 'Basic Information',
   partition: 'Partition',
+  taskId: 'Task ID',
   fileCount: 'File Count',
   fsn: 'FSN',
   commitTime: 'Commit Time',
@@ -99,6 +100,9 @@ export default {
   optimizingStatus: 'Optimizing Status',
   optimzerGroup: 'Optimizer Group',
   allGroups: 'All Groups',
+  retry: 'Retry',
+  costTime: 'Cost Time',
+  thread: 'Thread',
   resourceOccupation: 'Resource Occupation',
   core: 'Core',
   scaleOut: 'Scale-Out',
@@ -129,6 +133,7 @@ export default {
   ready: 'Ready',
   running: 'Running',
   cancel: 'Cancel',
+  cancelProcess: 'Cancel Process',
   finish: 'Finish',
   fail: 'Fail',
   loading: 'Loading',
@@ -179,7 +184,7 @@ export default {
   cannotDeleteGroupModalTitle: "Can't remove this group.",
   cannotDeleteGroupModalContent: 'This group has been used.',
   deleteGroupModalTitle: 'Remove this group',
-  processId: 'Process Id',
+  processId: 'Process ID',
   tasks: 'Tasks',
   recordChartTitle: 'Table record count',
   fileChartTitle: 'Table file count',

diff --git a/ams/dashboard/src/main/resources/static/css/app.d88750cc.css b/ams/dashboard/src/main/resources/static/css/app.d88750cc.css