You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@amoro.apache.org by ji...@apache.org on 2025/03/17 03:01:55 UTC
(amoro) branch master updated: [Improvement]fix some code style (#3471)
This is an automated email from the ASF dual-hosted git repository.
jinsongzhou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git
The following commit(s) were added to refs/heads/master by this push:
new a34c065f4 [Improvement]fix some code style (#3471)
a34c065f4 is described below
commit a34c065f4ed3e7100b18d2a1c6e83441f6cc1eda
Author: CosmosNi <62...@qq.com>
AuthorDate: Mon Mar 17 11:01:52 2025 +0800
[Improvement]fix some code style (#3471)
---
.../server/dashboard/component/reverser/IcebergTypeToSparkType.java | 1 -
.../apache/amoro/server/dashboard/controller/CatalogController.java | 2 +-
.../java/org/apache/amoro/formats/paimon/PaimonTableMetaExtract.java | 3 ++-
.../java/org/apache/amoro/formats/paimon/PaimonTypeToSparkType.java | 5 ++---
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTypeToSparkType.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTypeToSparkType.java
index b7ed4baed..89c9a8c68 100644
--- a/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTypeToSparkType.java
+++ b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/component/reverser/IcebergTypeToSparkType.java
@@ -114,7 +114,6 @@ public class IcebergTypeToSparkType extends TypeUtil.SchemaVisitor<DataType> {
// use String
return StringType$.MODULE$;
case FIXED:
- return BinaryType$.MODULE$;
case BINARY:
return BinaryType$.MODULE$;
case DECIMAL:
diff --git a/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/CatalogController.java b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/CatalogController.java
index 7bb783b09..fbbd2b651 100644
--- a/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/CatalogController.java
+++ b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/controller/CatalogController.java
@@ -643,7 +643,7 @@ public class CatalogController {
StringUtils.isNotEmpty(ctx.pathParam("catalogName")), "Catalog name is empty!");
ServerCatalog serverCatalog = catalogService.getServerCatalog(catalogName);
if (serverCatalog instanceof InternalCatalog) {
- ctx.json(OkResponse.of(serverCatalog.listTables().size() == 0));
+ ctx.json(OkResponse.of(serverCatalog.listTables().isEmpty()));
} else {
ctx.json(OkResponse.of(true));
}
diff --git a/amoro-format-paimon/src/main/java/org/apache/amoro/formats/paimon/PaimonTableMetaExtract.java b/amoro-format-paimon/src/main/java/org/apache/amoro/formats/paimon/PaimonTableMetaExtract.java
index 02c44f5a8..15df7e2d5 100644
--- a/amoro-format-paimon/src/main/java/org/apache/amoro/formats/paimon/PaimonTableMetaExtract.java
+++ b/amoro-format-paimon/src/main/java/org/apache/amoro/formats/paimon/PaimonTableMetaExtract.java
@@ -30,6 +30,7 @@ import org.apache.paimon.types.MapType;
import org.apache.paimon.types.RowType;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
@@ -41,7 +42,7 @@ public class PaimonTableMetaExtract implements TableMetaExtract<DataTable> {
SchemaManager schemaManager = new SchemaManager(table.fileIO(), table.location());
List<TableSchema> tableSchemas = schemaManager.listAll();
return tableSchemas.stream()
- .sorted((o1, o2) -> Long.compare(o1.timeMillis(), o2.timeMillis()))
+ .sorted(Comparator.comparingLong(TableSchema::timeMillis))
.map(
schema ->
new InternalTableMeta(
diff --git a/amoro-format-paimon/src/main/java/org/apache/amoro/formats/paimon/PaimonTypeToSparkType.java b/amoro-format-paimon/src/main/java/org/apache/amoro/formats/paimon/PaimonTypeToSparkType.java
index 106a4fcf2..632127a33 100644
--- a/amoro-format-paimon/src/main/java/org/apache/amoro/formats/paimon/PaimonTypeToSparkType.java
+++ b/amoro-format-paimon/src/main/java/org/apache/amoro/formats/paimon/PaimonTypeToSparkType.java
@@ -41,7 +41,6 @@ import org.apache.paimon.types.VarBinaryType;
import org.apache.paimon.types.VarCharType;
import org.apache.spark.sql.types.DataType;
import org.apache.spark.sql.types.DataTypes;
-import org.apache.spark.sql.types.LongType;
import org.apache.spark.sql.types.StructField;
import org.apache.spark.sql.types.StructType;
import org.apache.spark.sql.types.UserDefinedType;
@@ -51,7 +50,7 @@ import java.util.List;
import java.util.Optional;
/**
- * Copy from org.apache.paimon.spark.SparkTypeUtilsorg.apache.paimon.spark.SparkTypeUtils. Reason:
+ * Copy from org.apache.paimon.spark.SparkTypeUtils org.apache.paimon.spark.SparkTypeUtils. Reason:
* 1. Ams server don't have paimon-spark dependency.
*/
public class PaimonTypeToSparkType {
@@ -262,7 +261,7 @@ public class PaimonTypeToSparkType {
return new SmallIntType();
} else if (atomic instanceof org.apache.spark.sql.types.IntegerType) {
return new IntType();
- } else if (atomic instanceof LongType) {
+ } else if (atomic instanceof org.apache.spark.sql.types.LongType) {
return new BigIntType();
} else if (atomic instanceof org.apache.spark.sql.types.FloatType) {
return new FloatType();