You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by GitBox <gi...@apache.org> on 2022/03/03 11:58:06 UTC
[GitHub] [incubator-inlong] binaryWorld opened a new pull request #2875: [INLONG-2869][Manager] Support config order-preserving
binaryWorld opened a new pull request #2875:
URL: https://github.com/apache/incubator-inlong/pull/2875
### Title Name: [INLONG-XYZ][component] Title of the pull request
where *XYZ* should be replaced by the actual issue number.
Fixes #<xyz>
### 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
- [ ] Make sure that the change passes the CI checks.
*(Please pick either of the following options)*
This change is a trivial rework / code cleanup without any test coverage.
*(or)*
This change is already covered by existing tests, such as *(please describe tests)*.
*(or)*
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 followup 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-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] healchow commented on a change in pull request #2875: [INLONG-2869][Manager] Support config sync send data for agent and sort
Posted by GitBox <gi...@apache.org>.
healchow commented on a change in pull request #2875:
URL: https://github.com/apache/incubator-inlong/pull/2875#discussion_r818594100
##########
File path: inlong-manager/manager-web/sql/apache_inlong_manager.sql
##########
@@ -373,6 +373,7 @@ CREATE TABLE `inlong_stream`
`data_separator` varchar(8) DEFAULT NULL COMMENT 'The source data field separator, stored as ASCII code',
`data_escape_char` varchar(8) DEFAULT NULL COMMENT 'Source data field escape character, the default is NULL (NULL), stored as 1 character',
`have_predefined_fields` tinyint(1) DEFAULT '0' COMMENT '(File, DB access) whether there are predefined fields, 0: none, 1: yes (save to inlong_stream_field)',
+ `sync_send` tinyint(1) DEFAULT '0' COMMENT 'order_preserving 0: none, 1: yes',
Review comment:
Please add this field in another SQL file in the manager-test module.
--
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-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] healchow merged pull request #2875: [INLONG-2869][Manager] Support config sync send data for agent and sort
Posted by GitBox <gi...@apache.org>.
healchow merged pull request #2875:
URL: https://github.com/apache/incubator-inlong/pull/2875
--
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-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] binaryWorld commented on a change in pull request #2875: [INLONG-2869][Manager] Support config sync send data for agent and sort
Posted by GitBox <gi...@apache.org>.
binaryWorld commented on a change in pull request #2875:
URL: https://github.com/apache/incubator-inlong/pull/2875#discussion_r818598244
##########
File path: inlong-manager/manager-web/sql/apache_inlong_manager.sql
##########
@@ -373,6 +373,7 @@ CREATE TABLE `inlong_stream`
`data_separator` varchar(8) DEFAULT NULL COMMENT 'The source data field separator, stored as ASCII code',
`data_escape_char` varchar(8) DEFAULT NULL COMMENT 'Source data field escape character, the default is NULL (NULL), stored as 1 character',
`have_predefined_fields` tinyint(1) DEFAULT '0' COMMENT '(File, DB access) whether there are predefined fields, 0: none, 1: yes (save to inlong_stream_field)',
+ `sync_send` tinyint(1) DEFAULT '0' COMMENT 'order_preserving 0: none, 1: yes',
Review comment:
done
--
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-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-inlong] healchow commented on a change in pull request #2875: [INLONG-2869][Manager] Support config sync send data for agent and sort
Posted by GitBox <gi...@apache.org>.
healchow commented on a change in pull request #2875:
URL: https://github.com/apache/incubator-inlong/pull/2875#discussion_r819304561
##########
File path: inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AgentServiceImpl.java
##########
@@ -112,24 +117,27 @@ private TaskResult getTaskResult(TaskRequest request) {
// Query all tasks with status in 20x
String agentIp = request.getAgentIp();
String uuid = request.getUuid();
+ List<DataConfig> dataConfigs = Lists.newArrayList();
List<StreamSourceEntity> entityList = sourceMapper.selectByIpAndUuid(agentIp, uuid);
-
- List<DataConfig> dataConfigs = entityList.stream().map(entity -> {
+ for (StreamSourceEntity entity : entityList) {
DataConfig dataConfig = new DataConfig();
dataConfig.setJobId(entity.getId());
SourceType sourceType = SourceType.forType(entity.getSourceType());
dataConfig.setTaskType(sourceType.getTaskType().getType());
dataConfig.setTaskName(entity.getSourceName());
dataConfig.setOp(String.valueOf(entity.getStatus() % 100));
- dataConfig.setInlongGroupId(entity.getInlongGroupId());
- dataConfig.setInlongStreamId(entity.getInlongStreamId());
+ String inlongGroupId = entity.getInlongGroupId();
+ String inlongStreamId = entity.getInlongStreamId();
+ dataConfig.setInlongGroupId(inlongGroupId);
+ dataConfig.setInlongStreamId(inlongStreamId);
dataConfig.setIp(entity.getAgentIp());
dataConfig.setUuid(entity.getUuid());
dataConfig.setExtParams(entity.getExtParams());
dataConfig.setSnapshot(entity.getSnapshot());
- return dataConfig;
- }).collect(Collectors.toList());
-
+ InlongStreamEntity inlongStreamEntity = inlongStreamMapper.selectByIdentifier(inlongGroupId,inlongStreamId);
+ inlongStreamEntity.setSyncSend(inlongStreamEntity.getSyncSend());
Review comment:
It should be set in dataConfig, not stream entity.
--
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-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org