Merge remote-tracking branch 'origin/master' into format-renames

apache · Sep 4, 2024 · da1161d · da1161d
2 parents 5be4553 + 3b071f9
commit da1161d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/...o-ams/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java b/...o-ams/src/main/java/org/apache/amoro/server/dashboard/MixedAndIcebergTableDescriptor.java
@@ -171,7 +171,7 @@ public ServerTableMeta getTableDetail(AmoroTable<?> amoroTable) {
     return serverTableMeta;
   }
 
-  private String decorateTableFormat(AmoroTable table) {
+  private String decorateTableFormat(AmoroTable<?> table) {
     StringBuilder sb = new StringBuilder();
     sb.append(AmsUtil.formatString(table.format().name()));
     if (table.format().equals(TableFormat.ICEBERG)) {
@@ -340,14 +340,15 @@ public List<PartitionFileBaseInfo> getSnapshotDetail(
       AmoroTable<?> amoroTable, String snapshotId) {
     MixedTable mixedTable = getTable(amoroTable);
     List<PartitionFileBaseInfo> result = new ArrayList<>();
+    long commitId = Long.parseLong(snapshotId);
     Snapshot snapshot;
     if (mixedTable.isKeyedTable()) {
-      snapshot = mixedTable.asKeyedTable().changeTable().snapshot(snapshotId);
+      snapshot = mixedTable.asKeyedTable().changeTable().snapshot(commitId);
       if (snapshot == null) {
-        snapshot = mixedTable.asKeyedTable().baseTable().snapshot(snapshotId);
+        snapshot = mixedTable.asKeyedTable().baseTable().snapshot(commitId);
       }
     } else {
-      snapshot = mixedTable.asUnkeyedTable().snapshot(snapshotId);
+      snapshot = mixedTable.asUnkeyedTable().snapshot(commitId);
     }
     if (snapshot == null) {
       throw new IllegalArgumentException(

diff --git a/dist/src/main/amoro-bin/bin/ams.sh b/dist/src/main/amoro-bin/bin/ams.sh
@@ -28,9 +28,6 @@ JAVA_OPTS="-server -XX:+UseG1GC -XX:MaxGCPauseMillis=200 \
 -Xloggc:$AMORO_LOG_DIR/gc.log -XX:+PrintGCDateStamps -XX:+IgnoreUnrecognizedVMOptions -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=10M \
 -Xms${JVM_XMS_CONFIG}m -Xmx${JVM_XMX_CONFIG}m \
 -verbose:gc -XX:+PrintGCDetails \
--Dcom.sun.management.jmxremote \
--Dcom.sun.management.jmxremote.ssl=false \
--Dcom.sun.management.jmxremote.authenticate=false \
 --add-opens=java.base/java.lang=ALL-UNNAMED \
 --add-opens=java.base/java.lang.invoke=ALL-UNNAMED \
 --add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
@@ -47,7 +44,11 @@ JAVA_OPTS="-server -XX:+UseG1GC -XX:MaxGCPauseMillis=200 \
 "
 
 if [ -n "$JMX_REMOTE_PORT_CONFIG" ];then
-        JAVA_OPTS="${JAVA_OPTS} -Dcom.sun.management.jmxremote.port=${JMX_REMOTE_PORT_CONFIG} "
+  JAVA_OPTS="${JAVA_OPTS} -Dcom.sun.management.jmxremote.port=${JMX_REMOTE_PORT_CONFIG} \
+  -Dcom.sun.management.jmxremote \
+  -Dcom.sun.management.jmxremote.ssl=false \
+  -Dcom.sun.management.jmxremote.authenticate=false \
+  "
 fi
 
 if [ ! -z "$JVM_EXTRA_CONFIG" ];then

diff --git a/docs/admin-guides/managing-optimizers.md b/docs/admin-guides/managing-optimizers.md
@@ -70,7 +70,7 @@ The supported parameters include:
 ### Kubernetes container
 
 Kubernetes container is a way to start Optimizer On K8s with standalone Optimizer.
-To use flink container, you need to add a new container configuration. 
+To use Kubernetes container, you need to add a new container configuration. 
 with container-impl as `org.apache.amoro.server.manager.KubernetesOptimizerContainer`
 
 Kubernetes container support the following properties: