Re: [PR] [INLONG-9079][SDK] Shaded some dependencies to reduce conflicts with flink sdk [inlong]
dockerzhang commented on PR #9101: URL: https://github.com/apache/inlong/pull/9101#issuecomment-1794321325 Please unify all thrift dependency versions. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(inlong) branch master updated: [INLONG-9192][Manager] Flat Sort Cluster types (#9193)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 632a477ee7 [INLONG-9192][Manager] Flat Sort Cluster types (#9193)
632a477ee7 is described below
commit 632a477ee73b0a98910b14310b42b7b19938a8b0
Author: vernedeng
AuthorDate: Mon Nov 6 17:18:09 2023 +0800
[INLONG-9192][Manager] Flat Sort Cluster types (#9193)
---
.../inlong/manager/common/consts/SinkType.java | 2 +-
.../inlong/manager/common/enums/ClusterType.java | 11 ++-
.../dao/mapper/InlongClusterEntityMapper.java | 2 -
.../mappers/InlongClusterEntityMapper.xml | 10 --
.../cls/SortClsClusterInfo.java} | 19 ++--
.../cls/SortClsClusterRequest.java}| 21 ++--
.../es/SortEsClusterInfo.java} | 21 ++--
.../es/SortEsClusterRequest.java} | 14 +--
.../pulsar/SortPulsarClusterInfo.java} | 20 ++--
.../pulsar/SortPulsarClusterRequest.java} | 17 ++--
.../inlong/manager/pojo/sink/cls/ClsSink.java | 4 -
.../manager/pojo/sink/es/ElasticsearchSink.java| 4 +-
.../manager/pojo/sink/pulsar/PulsarSink.java | 4 -
.../BaseSortClusterDTO.java} | 31 ++
.../BaseSortClusterInfo.java} | 27 ++
.../BaseSortClusterRequest.java} | 14 +--
.../cluster/ElasticsearchClusterOperator.java | 93 --
.../service/cluster/InlongClusterOperator.java | 4 +-
.../service/cluster/SortClusterOperator.java | 106 +
.../cluster/SortStandaloneClusterOperator.java | 81
.../AbstractStandaloneSinkResourceOperator.java| 5 +-
.../service/cluster/InlongClusterServiceTest.java | 29 ++
.../resource/sink/StandaloneAutoAssignTest.java| 12 +--
.../sort-connectors/tubemq/pom.xml | 5 +
24 files changed, 204 insertions(+), 352 deletions(-)
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/consts/SinkType.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/consts/SinkType.java
index 965e809f51..f0b215ac30 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/consts/SinkType.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/consts/SinkType.java
@@ -25,7 +25,7 @@ public class SinkType extends StreamType {
public static final String HIVE = "HIVE";
public static final String CLICKHOUSE = "CLICKHOUSE";
public static final String HBASE = "HBASE";
-public static final String ELASTICSEARCH = "ELASTICSEARCH";
+public static final String ELASTICSEARCH = "ES";
public static final String HDFS = "HDFS";
public static final String GREENPLUM = "GREENPLUM";
public static final String MYSQL = "MYSQL";
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ClusterType.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ClusterType.java
index f6a33ff71e..6d010d25cc 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ClusterType.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ClusterType.java
@@ -32,8 +32,10 @@ public class ClusterType {
public static final String PULSAR = "PULSAR";
public static final String DATAPROXY = "DATAPROXY";
public static final String KAFKA = "KAFKA";
-public static final String ELASTICSEARCH = "ELASTICSEARCH";
-public static final String SORTSTANDALONE = "SORTSTANDALONE";
+
+public static final String SORT_ES = "SORT_ES";
+public static final String SORT_CLS = "SORT_CLS";
+public static final String SORT_PULSAR = "SORT_PULSAR";
private static final Set TYPE_SET = new HashSet() {
@@ -43,8 +45,9 @@ public class ClusterType {
add(ClusterType.PULSAR);
add(ClusterType.DATAPROXY);
add(ClusterType.KAFKA);
-add(ClusterType.ELASTICSEARCH);
-add(ClusterType.SORTSTANDALONE);
+add(ClusterType.SORT_ES);
+add(ClusterType.SORT_CLS);
+add(ClusterType.SORT_PULSAR);
}
};
diff --git
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/InlongClusterEntityMapper.java
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/InlongClusterEntityMapper.java
index a0d71abc5e..ce2644691d 100644
---
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/InlongClusterEntityMapper.java
+++
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/InlongClusterEntityMapper.java
Re: [PR] [INLONG-9192][Manager] Flat Sort Cluster types [inlong]
dockerzhang merged PR #9193: URL: https://github.com/apache/inlong/pull/9193 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] [INLONG-9219][Dashboard] Stream advanced options parameter optimization [inlong]
bluewang opened a new pull request, #9220: URL: https://github.com/apache/inlong/pull/9220 ### Prepare a Pull Request *(Change the title refer to the following example)* - Title Example: [INLONG-XYZ][Component] Title of the pull request *(The following *XYZ* should be replaced by the actual [GitHub Issue](https://github.com/apache/inlong/issues) number)* - Fixes https://github.com/apache/inlong/issues/9219 ### Motivation *Explain here the context, and why you're making that change. What is the problem you're trying to solve?* ### Modifications *Describe the modifications you've done.* ### Verifying this change   -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Bug] There is a problem using mysql-to-mysql with sort [inlong]
LiJie20190102 commented on issue #9199: URL: https://github.com/apache/inlong/issues/9199#issuecomment-1794486502 Functionally functional, the complete file is as follows： CREATE TABLE `table_11`( `id` bigint, PRIMARY KEY(id) NOT ENFORCED ) WITH ( 'connector' = 'mysql-cdc-inlong', 'hostname' = '192.168.1.133', 'database-name' = 'inlong_test', 'port' = '13306', 'username' = 'root', 'password' = 'qsdi1@3', 'table-name' = 'inlong_test.source1' ); CREATE TABLE `table_22`( PRIMARY KEY (`id`) NOT ENFORCED, `id` bigint) WITH ( 'connector' = 'jdbc-inlong', 'url' = 'jdbc:mysql://192.168.1.133:13306/inlong_test', 'username' = 'root', 'password' = 'qsdi1@3', 'table-name' = 'target1' ); INSERT INTO `table_22` SELECT `id` AS `id` FROM `table_11`; -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(inlong) branch master updated: [INLONG-9211][Manager] Fix failure to obtain data from Redis sink (#9212)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 78c39a3d99 [INLONG-9211][Manager] Fix failure to obtain data from
Redis sink (#9212)
78c39a3d99 is described below
commit 78c39a3d9940c88fd1656721916fc30ac2cfd263
Author: haifxu
AuthorDate: Mon Nov 6 22:05:38 2023 +0800
[INLONG-9211][Manager] Fix failure to obtain data from Redis sink (#9212)
---
.../postgresql/PostgreSQLResourceOperator.java | 2 +-
.../service/sink/redis/RedisSinkOperator.java | 45 ++
2 files changed, 38 insertions(+), 9 deletions(-)
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sink/postgresql/PostgreSQLResourceOperator.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sink/postgresql/PostgreSQLResourceOperator.java
index 7d6cbf42df..379dad813b 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sink/postgresql/PostgreSQLResourceOperator.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sink/postgresql/PostgreSQLResourceOperator.java
@@ -100,7 +100,7 @@ public class PostgreSQLResourceOperator implements
SinkResourceOperator {
try (Connection conn =
PostgreSQLJdbcUtils.getConnection(postgreSQLSink.getJdbcUrl(),
postgreSQLSink.getUsername(), postgreSQLSink.getPassword())) {
// 1.If schema not exists,create it
-PostgreSQLJdbcUtils.createSchema(conn, tableInfo.getTableName(),
tableInfo.getUserName());
+PostgreSQLJdbcUtils.createSchema(conn, tableInfo.getSchemaName(),
tableInfo.getUserName());
// 2.If table not exists, create it
PostgreSQLJdbcUtils.createTable(conn, tableInfo);
// 3.Table exists, add columns - skip the exists columns
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/redis/RedisSinkOperator.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/redis/RedisSinkOperator.java
index e22570942b..0a31f0a93c 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/redis/RedisSinkOperator.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sink/redis/RedisSinkOperator.java
@@ -22,6 +22,7 @@ import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
import org.apache.inlong.manager.common.exceptions.BusinessException;
import org.apache.inlong.manager.common.util.CommonBeanUtils;
import org.apache.inlong.manager.dao.entity.StreamSinkEntity;
+import org.apache.inlong.manager.pojo.node.redis.RedisDataNodeInfo;
import org.apache.inlong.manager.pojo.sink.SinkField;
import org.apache.inlong.manager.pojo.sink.SinkRequest;
import org.apache.inlong.manager.pojo.sink.StreamSink;
@@ -34,6 +35,7 @@ import
org.apache.inlong.manager.pojo.sink.redis.RedisSinkRequest;
import org.apache.inlong.manager.service.sink.AbstractSinkOperator;
import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -83,22 +85,26 @@ public class RedisSinkOperator extends AbstractSinkOperator
{
RedisSinkRequest sinkRequest = (RedisSinkRequest) request;
-String clusterMode = sinkRequest.getClusterMode();
-RedisClusterMode redisClusterMode = RedisClusterMode.of(clusterMode);
+if (StringUtils.isNotBlank(targetEntity.getDataNodeName())) {
+RedisDataNodeInfo dataNodeInfo = (RedisDataNodeInfo)
dataNodeHelper.getDataNodeInfo(
+targetEntity.getDataNodeName(),
targetEntity.getSinkType());
+
+CommonBeanUtils.copyProperties(dataNodeInfo, sinkRequest, true);
+}
+
+RedisClusterMode redisClusterMode =
RedisClusterMode.of(sinkRequest.getClusterMode());
expectNotNull(redisClusterMode,
"Redis ClusterMode must in one of " +
Arrays.toString(RedisClusterMode.values()) + " !");
switch (redisClusterMode) {
case CLUSTER:
-String clusterNodes = sinkRequest.getClusterNodes();
-checkClusterNodes(clusterNodes);
+checkClusterNodes(sinkRequest.getClusterNodes());
break;
case SENTINEL:
-String sentinelMasterName = sinkRequest.getMasterName();
-expectNotEmpty(sentinelMasterName, "Redis MasterName of
Sentinel cluster must not null!");
-String sentinelsInfo = sinkRequest.getSentinelsInfo();
-expectNotEmpty(sentinelsInfo, "Redis sentin
Re: [PR] [INLONG-9211][Manager] Fix failure to obtain data from Redis sink [inlong]
dockerzhang merged PR #9212: URL: https://github.com/apache/inlong/pull/9212 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] [INLONG-8674][Manager] Pulsar - Modify the calling method from SDK to HTTP [inlong]
fuweng11 commented on code in PR #8941:
URL: https://github.com/apache/inlong/pull/8941#discussion_r1384258176
##
inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/queue/pulsar/PulsarUtils.java:
##
@@ -39,54 +66,921 @@ public class PulsarUtils {
private PulsarUtils() {
}
+private static final DateTimeFormatter DATE_FORMAT =
DateTimeFormatter.ISO_OFFSET_DATE_TIME.withZone(
+ZoneId.systemDefault());
+
+public static final String QUERY_CLUSTERS_PATH = "/admin/v2/clusters";
+public static final String QUERY_BROKERS_PATH = "/admin/v2/brokers";
+public static final String QUERY_TENANTS_PATH = "/admin/v2/tenants";
+public static final String QUERY_NAMESPACE_PATH = "/admin/v2/namespaces";
+public static final String QUERY_PERSISTENT_PATH = "/admin/v2/persistent";
+public static final String LOOKUP_TOPIC_PATH = "/lookup/v2/topic";
+
+private static final Gson GSON = new GsonBuilder().create(); // thread safe
+
+/**
+ * Get http headers by token.
+ *
+ * @param token pulsar token info
+ * @return add http headers for token info
+ */
+private static HttpHeaders getHttpHeaders(String token) {
+HttpHeaders headers = new HttpHeaders();
+if (StringUtils.isNotEmpty(token)) {
+headers.add("Authorization", "Bearer " + token);
+}
+return headers;
+}
+
+/**
+ * Get pulsar cluster info list.
+ *
+ * @param restTemplate spring framework RestTemplate
+ * @param clusterInfo pulsar cluster info
+ * @return list of pulsar cluster infos
+ * @throws Exception any exception if occurred
+ */
+public static List getClusters(RestTemplate restTemplate,
PulsarClusterInfo clusterInfo)
+throws Exception {
+final String url = clusterInfo.getAdminUrl() + QUERY_CLUSTERS_PATH;
+return HttpUtils.request(restTemplate, url, HttpMethod.GET, null,
getHttpHeaders(clusterInfo.getToken()),
+ArrayList.class);
+}
+
/**
- * Get pulsar admin info
+ * Get the list of active brokers.
+ *
+ * @param restTemplate spring framework RestTemplate
+ * @param clusterInfo pulsar cluster info
+ * @return list of pulsar broker infos
+ * @throws Exception any exception if occurred
+ */
+public static List getBrokers(RestTemplate restTemplate,
PulsarClusterInfo clusterInfo)
+throws Exception {
+List clusters = getClusters(restTemplate, clusterInfo);
+List brokers = new ArrayList<>();
+for (String brokerName : clusters) {
+String url = clusterInfo.getAdminUrl() + QUERY_BROKERS_PATH + "/"
+ brokerName;
+brokers.addAll(
+HttpUtils.request(restTemplate, url, HttpMethod.GET, null,
getHttpHeaders(clusterInfo.getToken()),
+ArrayList.class));
+}
+return brokers;
+}
+
+/**
+ * Get pulsar tenant info list.
+ *
+ * @param restTemplate spring framework RestTemplate
+ * @param clusterInfo pulsar cluster info
+ * @return list of pulsar tenant infos
+ * @throws Exception any exception if occurred
*/
-public static PulsarAdmin getPulsarAdmin(PulsarClusterInfo pulsarCluster)
throws PulsarClientException {
-Preconditions.expectNotBlank(pulsarCluster.getAdminUrl(),
ErrorCodeEnum.INVALID_PARAMETER,
-"Pulsar adminUrl cannot be empty");
-PulsarAdmin pulsarAdmin;
-if (StringUtils.isEmpty(pulsarCluster.getToken())) {
-pulsarAdmin = getPulsarAdmin(pulsarCluster.getAdminUrl());
+public static List getTenants(RestTemplate restTemplate,
PulsarClusterInfo clusterInfo)
+throws Exception {
+final String url = clusterInfo.getAdminUrl() + QUERY_TENANTS_PATH;
+return HttpUtils.request(restTemplate, url, HttpMethod.GET, null,
getHttpHeaders(clusterInfo.getToken()),
+ArrayList.class);
+}
+
+/**
+ * Get pulsar namespace info list.
+ *
+ * @param restTemplate spring framework RestTemplate
+ * @param clusterInfo pulsar cluster info
+ * @param tenant pulsar tenant name
+ * @return list of pulsar namespace infos
+ * @throws Exception any exception if occurred
+ */
+public static List getNamespaces(RestTemplate restTemplate,
PulsarClusterInfo clusterInfo,
+String tenant) throws Exception {
+String url = clusterInfo.getAdminUrl() + QUERY_NAMESPACE_PATH + "/" +
tenant;
+return HttpUtils.request(restTemplate, url, HttpMethod.GET, null,
getHttpHeaders(clusterInfo.getToken()),
+ArrayList.class);
+}
+
+/**
+ * Create a new pulsar tenant.
+ *
+ * @param restTemplate spring framework RestTemplate
+ * @param clusterInfo pulsar cluster info
+ * @param tenant pulsar tenant name
+ * @param tenantInfo pulsar tenant info
+
Re: [PR] [INLONG-9219][Dashboard] Stream advanced options parameter optimization [inlong]
bluewang closed pull request #9220: [INLONG-9219][Dashboard] Stream advanced options parameter optimization URL: https://github.com/apache/inlong/pull/9220 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] [INLONG-9219][Dashboard] Stream advanced options parameter optimization [inlong]
bluewang commented on PR #9220: URL: https://github.com/apache/inlong/pull/9220#issuecomment-1797516083 Requirements do not need to change -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Improve][Dashboard] Stream advanced options parameter optimization [inlong]
bluewang commented on issue #9219: URL: https://github.com/apache/inlong/issues/9219#issuecomment-1797524293 Requirements do not need to change -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] [INLONG-9221][Dashboard] Fix sync MySQL sink without data node [inlong]
bluewang opened a new pull request, #9224: URL: https://github.com/apache/inlong/pull/9224 ### Prepare a Pull Request *(Change the title refer to the following example)* - Title Example: [INLONG-XYZ][Component] Title of the pull request *(The following *XYZ* should be replaced by the actual [GitHub Issue](https://github.com/apache/inlong/issues) number)* - Fixes https://github.com/apache/inlong/issues/9221 ### Motivation *Explain here the context, and why you're making that change. What is the problem you're trying to solve?* ### Modifications *Describe the modifications you've done.* ### Verifying this change  -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] [INLONG-9225] [inlong-audit]Automatically create audit topic after service startup [inlong]
LiJie20190102 opened a new pull request, #9226: URL: https://github.com/apache/inlong/pull/9226 Automatically create audit topic after service startup ### Prepare a Pull Request *(Change the title refer to the following example)* - Title Example: [INLONG-9225] [inlong-audit]Automatically create audit topic after service startup *(The following *XYZ* should be replaced by the actual [GitHub Issue](https://github.com/apache/inlong/issues) number)* - Fixes #9225 ### Motivation Currently, for audit services, topics need to be manually created. If they are not manually created or if the user is unaware of the need for manual creation, statistical information cannot be generated, and the corresponding tables have no data, which affects functionality. This modification is to use the program to create a topic and avoid this issue. ### Modifications *Describe the modifications you've done.* ### Verifying this change *(Please pick either of the following options)* - [ ] This change is a trivial rework/code cleanup without any test coverage. - [ √] This change is already covered by existing tests, such as: *(please describe tests)* 1. Modify audit. kafka. topic in the application. properties file, such as audit. kafka. topic=audit_ Topic_ Test (provided that the topic is not in kafka); 2. Restart the audit service and check if the topic was successfully created - [ ] This change added tests and can be verified as follows: *(example:)* - *Added integration tests for end-to-end deployment with large payloads (10MB)* - *Extended integration test for recovery after broker failure* ### Documentation - Does this pull request introduce a new feature? (yes / no) - If yes, how is the feature documented? (not applicable / docs / JavaDocs / not documented) - If a feature is not applicable for documentation, explain why? - If a feature is not documented yet in this PR, please create a follow-up issue for adding the documentation -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] [INLONG-9221][Dashboard] Fix sync MySQL sink without data node [inlong]
EMsnap merged PR #9224: URL: https://github.com/apache/inlong/pull/9224 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(inlong) branch master updated: [INLONG-9221][Dashboard] Fix sync MySQL sink without data node (#9224)
This is an automated email from the ASF dual-hosted git repository.
zirui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 003715e3e3 [INLONG-9221][Dashboard] Fix sync MySQL sink without data
node (#9224)
003715e3e3 is described below
commit 003715e3e377d835f58883155f32d2fd1cae516e
Author: Lizhen <88174078+bluew...@users.noreply.github.com>
AuthorDate: Tue Nov 7 14:45:41 2023 +0800
[INLONG-9221][Dashboard] Fix sync MySQL sink without data node (#9224)
---
.../src/plugins/sinks/defaults/MySQL.ts| 1 +
inlong-dashboard/src/ui/locales/en.json| 22 +++---
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/inlong-dashboard/src/plugins/sinks/defaults/MySQL.ts
b/inlong-dashboard/src/plugins/sinks/defaults/MySQL.ts
index a8c39dbadf..0f56db47db 100644
--- a/inlong-dashboard/src/plugins/sinks/defaults/MySQL.ts
+++ b/inlong-dashboard/src/plugins/sinks/defaults/MySQL.ts
@@ -131,6 +131,7 @@ export default class HiveSink extends SinkInfo implements
DataWithBackend, Rende
nodeType: 'MYSQL',
}),
})
+ @SyncField()
@I18n('meta.Sinks.DataNodeName')
dataNodeName: string;
diff --git a/inlong-dashboard/src/ui/locales/en.json
b/inlong-dashboard/src/ui/locales/en.json
index 25856de861..f54f0d2c62 100644
--- a/inlong-dashboard/src/ui/locales/en.json
+++ b/inlong-dashboard/src/ui/locales/en.json
@@ -122,15 +122,15 @@
"meta.Sinks.SinkName": "Name",
"meta.Sinks.SinkNameRule": "Only English letters, numbers, dots(.),
minus(-), and underscores(_)",
"meta.Sinks.SinkType": "Type",
- "meta.Sinks.Description": "SinkDescription",
+ "meta.Sinks.Description": "Sink description",
"meta.Sinks.SourceFieldName": "Source field name",
"meta.Sinks.SourceFieldType": "Source field type",
"meta.Sinks.SourceFieldNameRule": "At the beginning of English letters, only
English letters, numbers, and underscores",
"meta.Sinks.Username": "Username",
"meta.Sinks.Password": "Password",
- "meta.Sinks.EnableCreateResource": "EnableCreateResource",
+ "meta.Sinks.EnableCreateResource": "Create resource",
"meta.Sinks.EnableCreateResourceHelp": "If the library table already exists
and does not need to be modified, select [Do not create], otherwise select
[Create], and the system will automatically create the resource.",
- "meta.Sinks.DataNodeName": "DataNode",
+ "meta.Sinks.DataNodeName": "Data node",
"meta.Sinks.FieldTypeMessage": "Please enter field type",
"meta.Sinks.Hive.FileFormat": "File format",
"meta.Sinks.Hive.Day": "Day(s)",
@@ -234,15 +234,15 @@
"meta.Sinks.Greenplum.IsMetaField": "IsMetaField",
"meta.Sinks.Greenplum.FieldFormat": "FieldFormat",
"meta.Sinks.Greenplum.FieldDescription": "FieldDescription",
- "meta.Sinks.MySQL.DatabaseName": "DatabaseName",
- "meta.Sinks.MySQL.TableName": "TableName",
- "meta.Sinks.MySQL.PrimaryKey": "PrimaryKey",
- "meta.Sinks.MySQL.FieldName": "FieldName",
+ "meta.Sinks.MySQL.DatabaseName": "Database name",
+ "meta.Sinks.MySQL.TableName": "Table name",
+ "meta.Sinks.MySQL.PrimaryKey": "Primary key",
+ "meta.Sinks.MySQL.FieldName": "Field name",
"meta.Sinks.MySQL.FieldNameRule": "At the beginning of English letters, only
English letters, numbers, and underscores",
- "meta.Sinks.MySQL.FieldType": "FieldType",
+ "meta.Sinks.MySQL.FieldType": "Field type",
"meta.Sinks.MySQL.IsMetaField": "IsMetaField",
- "meta.Sinks.MySQL.FieldFormat": "FieldFormat",
- "meta.Sinks.MySQL.FieldDescription": "FieldDescription",
+ "meta.Sinks.MySQL.FieldFormat": "Field format",
+ "meta.Sinks.MySQL.FieldDescription": "Field description",
"meta.Sinks.Oracle.TableName": "TableName",
"meta.Sinks.Oracle.PrimaryKey": "PrimaryKey",
"meta.Sinks.Oracle.FieldName": "FieldName",
@@ -573,7 +573,7 @@
"components.Layout.Feedback": "Feedback",
"components.HighSelect.Customize": "Customize",
"components.HighSelect.SearchPlaceholder": "Please enter keyword...",
- "components.NodeSelect.Create": "Create Node",
+ "components.NodeSelect.Create": "Create node",
"components.FieldList.SinkFieldName": "Sink field name",
"components.FieldList.SinkFieldType": "Sink field type",
"components.FieldList.FieldComment": "Field comment",
Re: [PR] [INLONG-9221][Dashboard] Fix sync MySQL sink without data node [inlong]
LiJie20190102 commented on PR #9224: URL: https://github.com/apache/inlong/pull/9224#issuecomment-1797918800 LGTM -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@inlong.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
