This is an automated email from the ASF dual-hosted git repository.
czy006 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 041094326 [AMORO-3460] Fix some typos in java code or comments (#3461)
041094326 is described below
commit 041094326aa4f5f425145161d36cbc5480ada8a2
Author: yaolei <[email protected]>
AuthorDate: Sun Mar 9 19:29:14 2025 +0800
[AMORO-3460] Fix some typos in java code or comments (#3461)
* [AMORO-3448] Show total item count on paginated web pages
* [AMORO-3448] Show total item count on paginated web pages
* [AMORO-3460]Fix some typos in java code or comments
* Revert "[AMORO-3448] Show total item count on paginated web pages"
This reverts commit 5ff5ca1a1d21a2231d8da6fa02f7de21415cd9b0.
* Revert "[AMORO-3448] Show total item count on paginated web pages"
This reverts commit a00fa1006c0e07b28a929fd1775b42b2b8709867.
---
.../java/org/apache/amoro/server/dashboard/DashboardServer.java | 2 +-
.../server/table/executor/DanglingDeleteFilesCleaningExecutor.java | 3 ++-
.../amoro/server/optimizing/maintainer/TestDataExpireIceberg.java | 6 +++---
amoro-common/src/main/java/org/apache/amoro/utils/JacksonUtil.java | 2 +-
.../src/main/java/org/apache/amoro/hive/utils/ChangeFieldName.java | 2 +-
.../src/main/java/org/apache/amoro/hive/utils/HiveSchemaUtil.java | 2 +-
.../java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java | 2 +-
.../java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java | 2 +-
.../java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java | 2 +-
.../java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java | 2 +-
.../java/org/apache/amoro/optimizer/common/OptimizerExecutor.java | 4 ++--
.../org/apache/amoro/optimizer/common/OptimizerTestHelpers.java | 2 +-
.../org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java | 4 ++--
13 files changed, 18 insertions(+), 17 deletions(-)
diff --git
a/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java
b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java
index 6614f2038..a66c9feb6 100644
---
a/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java
+++
b/amoro-ams/src/main/java/org/apache/amoro/server/dashboard/DashboardServer.java
@@ -151,7 +151,7 @@ public class DashboardServer {
}
return indexHtml;
} catch (IOException e) {
- throw new UncheckedIOException("Load index html filed", e);
+ throw new UncheckedIOException("Load index html failed", e);
}
}
diff --git
a/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/DanglingDeleteFilesCleaningExecutor.java
b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/DanglingDeleteFilesCleaningExecutor.java
index 4050b4d7d..d2156d6ab 100644
---
a/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/DanglingDeleteFilesCleaningExecutor.java
+++
b/amoro-ams/src/main/java/org/apache/amoro/server/table/executor/DanglingDeleteFilesCleaningExecutor.java
@@ -29,7 +29,8 @@ import org.slf4j.LoggerFactory;
/** Clean table dangling delete files */
public class DanglingDeleteFilesCleaningExecutor extends BaseTableExecutor {
- private static final Logger LOG =
LoggerFactory.getLogger(OrphanFilesCleaningExecutor.class);
+ private static final Logger LOG =
+ LoggerFactory.getLogger(DanglingDeleteFilesCleaningExecutor.class);
private static final long INTERVAL = 24 * 60 * 60 * 1000L;
diff --git
a/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireIceberg.java
b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireIceberg.java
index f3221f5ad..0c3012ec9 100644
---
a/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireIceberg.java
+++
b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/maintainer/TestDataExpireIceberg.java
@@ -36,7 +36,7 @@ public class TestDataExpireIceberg extends TestDataExpire {
@Parameterized.Parameters(name = "{0}, {1}")
public static Object[] parameters() {
return new Object[][] {
- // Iceberg format partitioned by timestamp filed
+ // Iceberg format partitioned by timestamp field
{
new BasicCatalogTestHelper(TableFormat.ICEBERG),
new BasicTableTestHelper(false, true, getDefaultProp())
@@ -45,7 +45,7 @@ public class TestDataExpireIceberg extends TestDataExpire {
new BasicCatalogTestHelper(TableFormat.ICEBERG),
new BasicTableTestHelper(false, false, getDefaultProp())
},
- // Iceberg format partitioned by timestampz filed
+ // Iceberg format partitioned by timestampz field
{
new BasicCatalogTestHelper(TableFormat.ICEBERG),
new BasicTableTestHelper(
@@ -59,7 +59,7 @@ public class TestDataExpireIceberg extends TestDataExpire {
PartitionSpec.unpartitioned(),
getDefaultProp())
},
- // Iceberg format partitioned by date string filed
+ // Iceberg format partitioned by date string field
{
new BasicCatalogTestHelper(TableFormat.ICEBERG),
new BasicTableTestHelper(
diff --git a/amoro-common/src/main/java/org/apache/amoro/utils/JacksonUtil.java
b/amoro-common/src/main/java/org/apache/amoro/utils/JacksonUtil.java
index d6bb820e6..89f9188a8 100644
--- a/amoro-common/src/main/java/org/apache/amoro/utils/JacksonUtil.java
+++ b/amoro-common/src/main/java/org/apache/amoro/utils/JacksonUtil.java
@@ -125,7 +125,7 @@ public class JacksonUtil {
return textNode.asText();
}
- /** Retrieve the given map from a JsonNode, and return empty map if the
filed doesn't exist. */
+ /** Retrieve the given map from a JsonNode, and return empty map if the
field doesn't exist. */
public static <K, V> Map<K, V> getMap(
JsonNode jsonNode, String fieldName, TypeReference<Map<K, V>> mapType) {
Preconditions.checkNotNull(jsonNode, "JsonNode should not be null");
diff --git
a/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/ChangeFieldName.java
b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/ChangeFieldName.java
index 52a1a0393..adf9a73cc 100644
---
a/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/ChangeFieldName.java
+++
b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/ChangeFieldName.java
@@ -42,7 +42,7 @@ class ChangeFieldName extends
TypeUtil.CustomOrderSchemaVisitor<Type> {
private final Set<String> fieldNameSet = Sets.newHashSet();
/**
- * Change the filed name of a schema, change to uppercase or lowercase.
+ * Change the field name of a schema, change to uppercase or lowercase.
*
* @param changeType TO_UPPERCASE or TO_LOWERCASE
*/
diff --git
a/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/HiveSchemaUtil.java
b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/HiveSchemaUtil.java
index 3bda4fae9..7cf1a93e6 100644
---
a/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/HiveSchemaUtil.java
+++
b/amoro-format-mixed/amoro-mixed-hive/src/main/java/org/apache/amoro/hive/utils/HiveSchemaUtil.java
@@ -104,7 +104,7 @@ public class HiveSchemaUtil {
}
/**
- * Change the filed name in schema to lowercase.
+ * Change the field name in schema to lowercase.
*
* @param schema The original schema to change
* @return An new schema with lowercase field name
diff --git
a/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java
b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java
index 7f576e741..30f6d8f8d 100644
---
a/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java
+++
b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java
@@ -160,7 +160,7 @@ public class KeyedSparkBatchScan implements Scan, Batch,
SupportsReportStatistic
try (CloseableIterable<CombinedScanTask> tasksIterable =
scan.planTasks()) {
this.tasks = Lists.newArrayList(tasksIterable);
LOG.info(
- "mor statistics plan task end, cost time {}, tasks num {}",
+ "mor statistics plan task end, cost time {} ms, tasks num {}",
System.currentTimeMillis() - startTime,
tasks.size());
} catch (IOException e) {
diff --git
a/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java
b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java
index 7bb2931c8..d102b9bfd 100644
---
a/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java
+++
b/amoro-format-mixed/amoro-mixed-spark/v3.2/amoro-mixed-spark-3.2/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java
@@ -155,7 +155,7 @@ public class UnkeyedSparkBatchScan implements Scan, Batch,
SupportsReportStatist
try (CloseableIterable<CombinedScanTask> tasksIterable =
scan.planTasks()) {
this.tasks = Lists.newArrayList(tasksIterable);
LOG.info(
- "mor statistics plan task end, cost time {}, tasks num {}",
+ "mor statistics plan task end, cost time {} ms, tasks num {}",
System.currentTimeMillis() - startTime,
tasks.size());
} catch (IOException e) {
diff --git
a/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java
b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java
index 7f576e741..30f6d8f8d 100644
---
a/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java
+++
b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/reader/KeyedSparkBatchScan.java
@@ -160,7 +160,7 @@ public class KeyedSparkBatchScan implements Scan, Batch,
SupportsReportStatistic
try (CloseableIterable<CombinedScanTask> tasksIterable =
scan.planTasks()) {
this.tasks = Lists.newArrayList(tasksIterable);
LOG.info(
- "mor statistics plan task end, cost time {}, tasks num {}",
+ "mor statistics plan task end, cost time {} ms, tasks num {}",
System.currentTimeMillis() - startTime,
tasks.size());
} catch (IOException e) {
diff --git
a/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java
b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java
index 7bb2931c8..d102b9bfd 100644
---
a/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java
+++
b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-3.3/src/main/java/org/apache/amoro/spark/reader/UnkeyedSparkBatchScan.java
@@ -155,7 +155,7 @@ public class UnkeyedSparkBatchScan implements Scan, Batch,
SupportsReportStatist
try (CloseableIterable<CombinedScanTask> tasksIterable =
scan.planTasks()) {
this.tasks = Lists.newArrayList(tasksIterable);
LOG.info(
- "mor statistics plan task end, cost time {}, tasks num {}",
+ "mor statistics plan task end, cost time {} ms, tasks num {}",
System.currentTimeMillis() - startTime,
tasks.size());
} catch (IOException e) {
diff --git
a/amoro-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerExecutor.java
b/amoro-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerExecutor.java
index 197be5f8f..854c991b8 100644
---
a/amoro-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerExecutor.java
+++
b/amoro-optimizer/amoro-optimizer-common/src/main/java/org/apache/amoro/optimizer/common/OptimizerExecutor.java
@@ -153,7 +153,7 @@ public class OptimizerExecutor extends
AbstractOptimizerOperator {
result.setTaskOutput(outputByteBuffer);
result.setSummary(output.summary());
logger.info(
- "Optimizer executor[{}] executed task[{}]({}) and cost {}",
+ "Optimizer executor[{}] executed task[{}]({}) and cost {} ms",
threadId,
task.getTaskId(),
input,
@@ -161,7 +161,7 @@ public class OptimizerExecutor extends
AbstractOptimizerOperator {
return result;
} catch (Throwable t) {
logger.error(
- "Optimizer executor[{}] executed task[{}] failed and cost {}",
+ "Optimizer executor[{}] executed task[{}] failed and cost {} ms",
threadId,
task.getTaskId(),
System.currentTimeMillis() - startTime,
diff --git
a/amoro-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/OptimizerTestHelpers.java
b/amoro-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/OptimizerTestHelpers.java
index 178461847..55adede19 100644
---
a/amoro-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/OptimizerTestHelpers.java
+++
b/amoro-optimizer/amoro-optimizer-common/src/test/java/org/apache/amoro/optimizer/common/OptimizerTestHelpers.java
@@ -29,7 +29,7 @@ public class OptimizerTestHelpers {
try {
return new OptimizerConfig(optimizerArgs);
} catch (CmdLineException e) {
- throw new RuntimeException("Build optimizer config filed", e);
+ throw new RuntimeException("Build optimizer config failed", e);
}
}
diff --git
a/amoro-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java
b/amoro-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java
index 7cdcd2522..91eb9a9e5 100644
---
a/amoro-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java
+++
b/amoro-optimizer/amoro-optimizer-spark/src/main/java/org/apache/amoro/optimizer/spark/SparkOptimizerExecutor.java
@@ -61,14 +61,14 @@ public class SparkOptimizerExecutor extends
OptimizerExecutor {
List<OptimizingTaskResult> results = jsc.parallelize(of,
1).map(taskFunction).collect();
result = results.get(0);
LOG.info(
- "Optimizer executor[{}] executed task[{}] and cost {}",
+ "Optimizer executor[{}] executed task[{}] and cost {} ms",
threadName,
task.getTaskId(),
System.currentTimeMillis() - startTime);
return result;
} catch (Throwable r) {
LOG.error(
- "Optimizer executor[{}] executed task[{}] failed, and cost {}",
+ "Optimizer executor[{}] executed task[{}] failed, and cost {} ms",
threadName,
task.getTaskId(),
(System.currentTimeMillis() - startTime),
