Merge branch 'master' into 0.7.x

apache · Jul 12, 2024 · 3a89437 · 3a89437
2 parents 75fdff9 + 9b3318d
commit 3a89437
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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>
 

diff --git a/...ams/amoro-ams-server/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java b/...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/...erver/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java b/...erver/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;
   }