This is an automated email from the ASF dual-hosted git repository.
tcodehuber028 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 80c9abab6 [AMORO-2754]: Improve Chinese characters (#2785)
80c9abab6 is described below
commit 80c9abab6c2f0b92d5dfc208a8880028f9559800
Author: Check Null <[email protected]>
AuthorDate: Fri Apr 26 11:14:15 2024 +0800
[AMORO-2754]: Improve Chinese characters (#2785)
* Improve Chinese characters
* Fix svg display have a problem,Optimize translation, run mvn
spotless:apply
* rollback test UnicodeCharacter
* Improve Chinese characters to Unicode
* Optimize translation
---
.../org/apache/amoro/api/metrics/TestMetricDefine.java | 13 +++++++------
amoro-ams/amoro-ams-dashboard/mock/modules/overview.js | 4 ++--
.../amoro-ams-dashboard/src/assets/icons/svg/branch.svg | 2 +-
.../amoro-ams-dashboard/src/assets/icons/svg/paimon.svg | 7 +++----
.../amoro-ams-dashboard/src/assets/icons/svg/slide.svg | 15 +++++++--------
.../amoro-ams-dashboard/src/assets/icons/svg/tag.svg | 2 +-
amoro-ams/amoro-ams-dashboard/src/styles/global.less | 2 +-
amoro-ams/amoro-ams-dashboard/src/utils/request.ts | 2 +-
amoro-ams/amoro-ams-dashboard/vite.config.ts | 2 +-
.../org/apache/amoro/log/LogDataToJsonConverters.java | 2 +-
.../amoro/trino/keyed/KeyedConnectorSplitManager.java | 2 +-
.../apache/amoro/trino/unkeyed/ArcticTrinoCatalog.java | 1 -
.../org/apache/amoro/trino/iceberg/BaseConnectorTest.java | 4 ++--
.../amoro/trino/iceberg/TestBasicArcticCatalog.java | 2 +-
docs/engines/flink/flink-dml.md | 2 +-
15 files changed, 30 insertions(+), 32 deletions(-)
diff --git
a/amoro-ams/amoro-ams-api/src/test/java/org/apache/amoro/api/metrics/TestMetricDefine.java
b/amoro-ams/amoro-ams-api/src/test/java/org/apache/amoro/api/metrics/TestMetricDefine.java
index fc5efd021..915276fd2 100644
---
a/amoro-ams/amoro-ams-api/src/test/java/org/apache/amoro/api/metrics/TestMetricDefine.java
+++
b/amoro-ams/amoro-ams-api/src/test/java/org/apache/amoro/api/metrics/TestMetricDefine.java
@@ -52,32 +52,33 @@ public class TestMetricDefine {
static Stream<Arguments> provideMetricNamesForEquality() {
return Stream.of(
- // 相同的 name, tags, type 应该返回 true
+ // Return true with the same name, tags and type
Arguments.of(
new MetricDefine(
"test-define", Arrays.asList("tag1", "tag2"),
MetricType.Counter, "description"),
true),
- // 不同的 name 应该返回 false
+ // Return false with the different name
Arguments.of(
new MetricDefine(
"different-name", Arrays.asList("tag1", "tag2"),
MetricType.Counter, "description"),
false),
- // 集合顺序不相同 tags 应该返回 true
+ // Return true if the order of elements in tags is different
Arguments.of(
new MetricDefine(
"test-define", Arrays.asList("tag2", "tag1"),
MetricType.Counter, "description"),
true),
- // 不同的 tags 集合内容不同应该返回 false
+ // Return false if tags contain different elements inside
Arguments.of(
new MetricDefine(
"test-define", Arrays.asList("tag3", "tag4"),
MetricType.Counter, "description"),
false),
- // 不同的 MetricType 应该返回 false
+ // Return false with different MetricType
Arguments.of(
new MetricDefine(
"test-define", Arrays.asList("tag1", "tag2"),
MetricType.Gauge, "description"),
false),
- // 即使 description 不同，因为它不参与 equals 和 hashCode，所以应该返回 true
+ // Return true if they are different with description. That is because
the description isn't
+ // truly involved in the functions of equals and hashCode.
Arguments.of(
new MetricDefine(
"test-define",
diff --git a/amoro-ams/amoro-ams-dashboard/mock/modules/overview.js
b/amoro-ams/amoro-ams-dashboard/mock/modules/overview.js
index 3be45d78c..9c19594de 100644
--- a/amoro-ams/amoro-ams-dashboard/mock/modules/overview.js
+++ b/amoro-ams/amoro-ams-dashboard/mock/modules/overview.js
@@ -66,7 +66,7 @@ export default [
'83.24'
],
usedCpuDivision: [
- '1828核/2196核'
+ '1828C/2196C'
],
usedCpuPercent: [
'83.24%'
@@ -75,7 +75,7 @@ export default [
'83.24'
],
usedMemDivision: [
- '1828核/2196核10364G'
+ '1828C/2196C10364G'
],
usedMemPercent: [
'83.24%'
diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/branch.svg
b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/branch.svg
index 740f92e5e..47531606e 100644
--- a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/branch.svg
+++ b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/branch.svg
@@ -17,4 +17,4 @@ See the License for the specific language governing
permissions and
limitations under the License.
/-->
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG
1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";><svg
t="1699950486606" class="icon" viewBox="0 0 1024 1024" version="1.1"
xmlns="http://www.w3.org/2000/svg"; p-id="1463"
xmlns:xlink="http://www.w3.org/1999/xlink"; width="200" height="200"><path
d="M792.66816 80.2304c-76.06272 0-137.85088 61.78816-137.85088 137.85088 0
61.66528 40.74496 113.98144 96.62464 131.584v118.03648L275.72224
623.5136V273.59232c54. [...]
\ No newline at end of file
+<svg t="1699950486606" class="icon" viewBox="0 0 1024 1024" version="1.1"
xmlns="http://www.w3.org/2000/svg"; p-id="1463"
xmlns:xlink="http://www.w3.org/1999/xlink"; width="200" height="200"><path
d="M792.66816 80.2304c-76.06272 0-137.85088 61.78816-137.85088 137.85088 0
61.66528 40.74496 113.98144 96.62464 131.584v118.03648L275.72224
623.5136V273.59232c54.40512-18.46272 93.5424-70.03136 93.5424-130.59072
0-76.06272-61.78816-137.85088-137.85088-137.85088S93.56288 66.93888 93.56288
143.0016 [...]
\ No newline at end of file
diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/paimon.svg
b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/paimon.svg
index 73c9a9d91..36601c37e 100644
--- a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/paimon.svg
+++ b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/paimon.svg
@@ -17,16 +17,15 @@ See the License for the specific language governing
permissions and
limitations under the License.
/-->
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="_图层_2" data-name="图层 2" xmlns="http://www.w3.org/2000/svg"; viewBox="0
0 307.34 218.61">
+<svg id="layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg";
viewBox="0 0 307.34 218.61">
<defs>
<style>
.cls-1 {
- fill: #0666ff;
+ fill: #0666ff;
}
</style>
</defs>
- <g id="_图层_1-2" data-name="图层 1">
+ <g id="layer_1-2" data-name="Layer 1">
<path class="cls-1"
d="m307.34,46.55l-50.19,14.1c.47.94.92,1.89,1.36,2.84l48.83-16.94Z"/>
<path class="cls-1"
d="m62.72,170.47l-12.62,25.69H0l22.99,4.72c7.55,1.55,14.28,5.8,18.93,11.96l20.16-23.6c3.71-4.16,7.5-8.23,11.36-12.24-2.97-3.76-5.69-7.71-8.15-11.84-.86,1.74-1.72,3.51-2.56,5.31Z"/>
<path class="cls-1"
d="m105.58,111.28c-3.51-10.04-11.49-18.15-21.95-21.65l-12.74-4.26h80.4c19.85-7.47,43.6-13.02,72.56-17.39l19.6-3.48,13.7-3.85C239.25,24.7,202.14,0,159.25,0,98.89,0,49.95,48.94,49.95,109.3c0,20.41,5.6,39.51,15.34,55.85,11.13-22.5,23.81-40.04,40.29-53.88Z"/>
diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/slide.svg
b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/slide.svg
index a2f6bf1c0..8158a7e6d 100644
--- a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/slide.svg
+++ b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/slide.svg
@@ -17,19 +17,18 @@ See the License for the specific language governing
permissions and
limitations under the License.
/-->
-<?xml version="1.0" encoding="UTF-8"?>
<svg width="10px" height="28px" viewBox="0 0 10 28" version="1.1"
xmlns="http://www.w3.org/2000/svg";>
<!-- Generator: Sketch 56.2 (81672) - https://sketch.com -->
<title>slide</title>
<desc>Created with Sketch.</desc>
<g id="new" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
- <g id="2-计算-0" transform="translate(-267.000000, -399.000000)">
- <g id="全局/图标/滑动-浅" transform="translate(267.000000, 399.000000)">
- <g id="图标/more">
- <rect id="矩形" fill="#E0E2E6" x="0" y="0" width="10"
height="28" rx="2"></rect>
- <circle id="椭圆形" fill="#424D69" cx="5" cy="9"
r="1"></circle>
- <circle id="椭圆形备份-2" fill="#424D69" cx="5" cy="14"
r="1"></circle>
- <circle id="椭圆形备份-6" fill="#424D69" cx="5" cy="19"
r="1"></circle>
+ <g id="2-compute-0" transform="translate(-267.000000, -399.000000)">
+ <g id="global/icon/slide-light" transform="translate(267.000000,
399.000000)">
+ <g id="icon/more">
+ <rect id="rectangle" fill="#E0E2E6" x="0" y="0" width="10"
height="28" rx="2"></rect>
+ <circle id="circle" fill="#424D69" cx="5" cy="9"
r="1"></circle>
+ <circle id="circle-copy-2" fill="#424D69" cx="5" cy="14"
r="1"></circle>
+ <circle id="circle-copy-6" fill="#424D69" cx="5" cy="19"
r="1"></circle>
</g>
</g>
</g>
diff --git a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/tag.svg
b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/tag.svg
index 06b8ada2f..c09f55138 100644
--- a/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/tag.svg
+++ b/amoro-ams/amoro-ams-dashboard/src/assets/icons/svg/tag.svg
@@ -17,4 +17,4 @@ See the License for the specific language governing
permissions and
limitations under the License.
/-->
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG
1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";><svg
t="1699950513480" class="icon" viewBox="0 0 1024 1024" version="1.1"
xmlns="http://www.w3.org/2000/svg"; p-id="4015"
xmlns:xlink="http://www.w3.org/1999/xlink"; width="200" height="200"><path
d="M512 910.208L910.208 512 480.832 82.624l-378.816 24.448-19.776 373.376L512
910.208zM0 512L25.472 31.36 512 0l512 512-512 512-512-512z
m293.376-128.96a85.952 85 [...]
\ No newline at end of file
+<svg t="1699950513480" class="icon" viewBox="0 0 1024 1024" version="1.1"
xmlns="http://www.w3.org/2000/svg"; p-id="4015"
xmlns:xlink="http://www.w3.org/1999/xlink"; width="200" height="200"><path
d="M512 910.208L910.208 512 480.832 82.624l-378.816 24.448-19.776 373.376L512
910.208zM0 512L25.472 31.36 512 0l512 512-512 512-512-512z
m293.376-128.96a85.952 85.952 0 1 0 0-171.904 85.952 85.952 0 0 0 0 171.904z"
fill="#262626" p-id="4016"></path></svg>
\ No newline at end of file
diff --git a/amoro-ams/amoro-ams-dashboard/src/styles/global.less
b/amoro-ams/amoro-ams-dashboard/src/styles/global.less
index 998589605..b2399fcc6 100644
--- a/amoro-ams/amoro-ams-dashboard/src/styles/global.less
+++ b/amoro-ams/amoro-ams-dashboard/src/styles/global.less
@@ -406,7 +406,7 @@ textarea {
}
.g {
- /* 最多显示n行，多出省略号，title*/
+ /* Display up to n lines, with ellipsis for overflow, and title */
&-max-line {
.over-text{
overflow: hidden;
diff --git a/amoro-ams/amoro-ams-dashboard/src/utils/request.ts
b/amoro-ams/amoro-ams-dashboard/src/utils/request.ts
index 8ed7873e8..988b0b67b 100644
--- a/amoro-ams/amoro-ams-dashboard/src/utils/request.ts
+++ b/amoro-ams/amoro-ams-dashboard/src/utils/request.ts
@@ -93,7 +93,7 @@ instance.interceptors.response.use(
if (response.status === 200 && response.data) {
return response
} else {
- return Promise.reject(new Error('网络错误'))
+ return Promise.reject(new Error('Network error'))
}
},
(error) => {
diff --git a/amoro-ams/amoro-ams-dashboard/vite.config.ts
b/amoro-ams/amoro-ams-dashboard/vite.config.ts
index 89289d9c1..828720e22 100644
--- a/amoro-ams/amoro-ams-dashboard/vite.config.ts
+++ b/amoro-ams/amoro-ams-dashboard/vite.config.ts
@@ -93,7 +93,7 @@ export default defineConfig({
},
resolve: {
alias: {
- '@': path.resolve(__dirname, './src') // 路径别名
+ '@': path.resolve(__dirname, './src') // Path alias
}
}
})
diff --git
a/amoro-core/src/main/java/org/apache/amoro/log/LogDataToJsonConverters.java
b/amoro-core/src/main/java/org/apache/amoro/log/LogDataToJsonConverters.java
index 17171d6f7..bdb1a1016 100644
--- a/amoro-core/src/main/java/org/apache/amoro/log/LogDataToJsonConverters.java
+++ b/amoro-core/src/main/java/org/apache/amoro/log/LogDataToJsonConverters.java
@@ -73,7 +73,7 @@ public class LogDataToJsonConverters implements Serializable {
private static <T> LogDataToJsonConverter<T> createNotNullConverter(
Type type, LogData.FieldGetterFactory<T> fieldGetterFactory) {
- // 以下 switch case 来源于 org.apache.iceberg.types.TypeUtil
+ // The following switch case originates from
org.apache.iceberg.types.TypeUtil
// and org.apache.iceberg.flink.TypeToFlinkType
switch (type.typeId()) {
case BOOLEAN:
diff --git
a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorSplitManager.java
b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorSplitManager.java
index 46e764c5e..8a4007576 100644
---
a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorSplitManager.java
+++
b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/keyed/KeyedConnectorSplitManager.java
@@ -105,7 +105,7 @@ public class KeyedConnectorSplitManager implements
ConnectorSplitManager {
ClassLoader pluginClassloader = arcticTable.getClass().getClassLoader();
try (ThreadContextClassLoader ignored = new
ThreadContextClassLoader(pluginClassloader)) {
- // 优化
+ // Optimization
CloseableIterable<CombinedScanTask> combinedScanTasks =
MetricUtil.duration(tableScan::planTasks, "plan tasks");
diff --git
a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/ArcticTrinoCatalog.java
b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/ArcticTrinoCatalog.java
index c1dfea64d..f73cb170f 100644
---
a/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/ArcticTrinoCatalog.java
+++
b/amoro-mixed-format/amoro-mixed-format-trino/src/main/java/org/apache/amoro/trino/unkeyed/ArcticTrinoCatalog.java
@@ -197,7 +197,6 @@ public class ArcticTrinoCatalog implements TrinoCatalog {
@Override
public String defaultTableLocation(ConnectorSession session, SchemaTableName
schemaTableName) {
- // 不会使用
return null;
}
diff --git
a/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/BaseConnectorTest.java
b/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/BaseConnectorTest.java
index d4b0dcec2..84a4f8dc8 100644
---
a/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/BaseConnectorTest.java
+++
b/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/BaseConnectorTest.java
@@ -2759,7 +2759,7 @@ public abstract class BaseConnectorTest extends
AbstractTestQueries {
+ "(test) VALUES 'Hello', U&'hello\\6d4B\\8Bd5world\\7F16\\7801'
",
2);
assertThat(computeActual("SELECT test FROM " +
table.getName()).getOnlyColumnAsSet())
- .containsExactlyInAnyOrder("Hello", "hello测试world编码");
+ .containsExactlyInAnyOrder("Hello",
"hello\u6d4B\u8Bd5world\u7F16\u7801");
}
try (TestTable table =
@@ -2795,7 +2795,7 @@ public abstract class BaseConnectorTest extends
AbstractTestQueries {
+ "(test) VALUES 'Hello',
U&'hello\\6d4B\\8Bd5\\+10FFFFworld\\7F16\\7801' ",
2);
assertThat(computeActual("SELECT test FROM " +
table.getName()).getOnlyColumnAsSet())
- .containsExactlyInAnyOrder("Hello", "hello测试�world编码");
+ .containsExactlyInAnyOrder("Hello",
"hello\u6d4B\u8Bd5\uDBFF\uDFFFworld\u7F16\u7801");
}
}
diff --git
a/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/TestBasicArcticCatalog.java
b/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/TestBasicArcticCatalog.java
index 742b01410..ff52caa09 100644
---
a/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/TestBasicArcticCatalog.java
+++
b/amoro-mixed-format/amoro-mixed-format-trino/src/test/java/org/apache/amoro/trino/iceberg/TestBasicArcticCatalog.java
@@ -48,7 +48,7 @@ public class TestBasicArcticCatalog extends
BasicArcticCatalog {
this.location = location;
Configuration conf = new Configuration();
this.catalog = new HadoopCatalog(conf, location);
- // 创建catalog.db，便于测试
+ // Create catalog.db for testing purposes
if (!catalog.namespaceExists(Namespace.of(catalog.name(), "tpch"))) {
catalog.createNamespace(Namespace.of(catalog.name(), "tpch"));
}
diff --git a/docs/engines/flink/flink-dml.md b/docs/engines/flink/flink-dml.md
index 61d2b770b..1901a6afd 100644
--- a/docs/engines/flink/flink-dml.md
+++ b/docs/engines/flink/flink-dml.md
@@ -91,7 +91,7 @@ The following Hint Options are supported:
| scan.startup.timestamp-millis | (none) | Long | No
| Valid when
'scan.startup.mode' = 'timestamp', reads data from the specified Kafka time
with a millisecond timestamp starting at 00:00:00.000 GMT on 1 Jan 1970
[...]
| scan.startup.specific-offsets | (none) | String | No
| specify offsets for each
partition in case of 'specific-offsets' startup mode, e.g.
'partition:0,offset:42;partition:1,offset:300'.
[...]
| properties.group.id | (none) | String | If the
LogStore for an Amoro table is Kafka, it is mandatory to provide its details
while querying the table. Otherwise, it can be left empty. | The group id used
to read the Kafka Topic
[...]
-| properties.pulsar.admin.adminUrl | (none) | String | Required if
LogStore is pulsar, otherwise not required
| Pulsar admin 的 HTTP
URL，如：http://my-broker.example.com:8080
[...]
+| properties.pulsar.admin.adminUrl | (none) | String | Required if
LogStore is pulsar, otherwise not required
| Pulsar admin's HTTP URL，
e.g. http://my-broker.example.com:8080
[...]
| properties.* | (none) | String | No
| Parameters for Logstore:
<br>For Logstore with Kafka ('log-store.type'='kafka' default value), all other
parameters supported by the Kafka Consumer can be set by prefixing properties.
to the parameter name, for example, 'properties.batch.size'='16384'. The
complete parameter inform [...]
| log.consumer.changelog.modes | all-kinds | String | No
| The type of RowKind that
will be generated when reading log data, supports: all-kinds,
append-only.<br>all-kinds: will read cdc data, including
+I/-D/-U/+U;<br>append-only: will only generate Insert data, recommended to use
this configuration when reading without primary key. [...]
