This is an automated email from the ASF dual-hosted git repository.
healchow 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 cc8d99dea [INLONG-8047][Manager][Sort] Rename lightweight to dataSync
(#8048)
cc8d99dea is described below
commit cc8d99dea90e539c72a170b696b2d856225951f0
Author: haifxu <xhf1208357...@gmail.com>
AuthorDate: Mon May 22 13:00:01 2023 +0800
[INLONG-8047][Manager][Sort] Rename lightweight to dataSync (#8048)
---
.../src/ui/pages/GroupDashboard/index.tsx | 4 ++--
.../apache/inlong/manager/client/BaseExample.java | 4 ++--
.../apache/inlong/manager/client/ut/BaseTest.java | 4 ++--
.../inlong/manager/client/ut/Kafka2HiveTest.java | 6 +++---
.../inlong/manager/client/cli/CreateCommand.java | 4 ++--
.../manager/client/cli/consts/GroupConstants.java | 2 +-
.../client/api/impl/InlongGroupImplTest.java | 2 +-
.../manager/common/consts/InlongConstants.java | 2 +-
.../inlong/manager/common/enums/ErrorCodeEnum.java | 2 +-
.../inlong/manager/common/enums/GroupMode.java | 4 ++--
.../manager/dao/entity/InlongGroupEntity.java | 2 +-
.../dao/mapper/InlongGroupEntityMapper.java | 2 +-
.../resources/mappers/InlongGroupEntityMapper.xml | 22 +++++++++++-----------
.../inlong/manager/pojo/group/InlongGroupInfo.java | 4 ++--
.../manager/pojo/group/InlongGroupPageRequest.java | 4 ++--
.../manager/pojo/group/InlongGroupRequest.java | 6 +++---
.../inlong/manager/pojo/page/PageResultTest.java | 4 ++--
.../manager/service/group/InlongGroupService.java | 2 +-
.../service/group/InlongGroupServiceImpl.java | 4 ++--
.../listener/group/InitGroupCompleteListener.java | 2 +-
.../group/UpdateGroupCompleteListener.java | 8 ++++----
.../listener/queue/QueueResourceListener.java | 2 +-
.../queue/StreamQueueResourceListener.java | 2 +-
.../listener/source/SourceDeleteListener.java | 2 +-
.../listener/source/SourceRestartListener.java | 2 +-
.../listener/source/SourceStopListener.java | 2 +-
.../stream/InitStreamCompleteListener.java | 2 +-
.../resource/sort/DefaultSortConfigOperator.java | 2 +-
.../service/source/AbstractSourceOperator.java | 2 +-
.../service/source/StreamSourceService.java | 2 +-
.../service/source/StreamSourceServiceImpl.java | 8 ++++----
.../service/mocks/MockDeleteSourceListener.java | 2 +-
.../service/mocks/MockRestartSourceListener.java | 2 +-
.../service/mocks/MockStopSourceListener.java | 2 +-
.../main/resources/h2/apache_inlong_manager.sql | 2 +-
.../manager-web/sql/apache_inlong_manager.sql | 2 +-
.../sql/changes-1.8.0.sql} | 18 +++++++-----------
.../web/controller/InlongGroupController.java | 6 +++---
.../inlong/sort/configuration/Configuration.java | 9 +++++----
.../inlong/sort/configuration/Constants.java | 4 ++--
40 files changed, 82 insertions(+), 85 deletions(-)
diff --git a/inlong-dashboard/src/ui/pages/GroupDashboard/index.tsx
b/inlong-dashboard/src/ui/pages/GroupDashboard/index.tsx
index 1b628dbac..3a9291041 100644
--- a/inlong-dashboard/src/ui/pages/GroupDashboard/index.tsx
+++ b/inlong-dashboard/src/ui/pages/GroupDashboard/index.tsx
@@ -41,7 +41,7 @@ const Comp: React.FC = () => {
// mqType: '',
pageSize: defaultSize,
pageNum: 1,
- lightweight: 0,
+ inlongGroupMode: 0,
});
const [groupLogs, setGroupLogs] = useState({
@@ -52,7 +52,7 @@ const Comp: React.FC = () => {
const { data: summary = {} } = useRequest({
url: '/group/countByStatus',
params: {
- lightweight: 0,
+ inlongGroupMode: 0,
},
});
diff --git
a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/BaseExample.java
b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/BaseExample.java
index dfa4cc6ee..48c14f962 100644
---
a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/BaseExample.java
+++
b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/BaseExample.java
@@ -74,10 +74,10 @@ public class BaseExample {
pulsarInfo.setTenant(tenant);
pulsarInfo.setMqResource(namespace);
- // set enable zk, create resource, lightweight mode, and cluster tag
+ // set enable zk, create resource, group mode, and cluster tag
pulsarInfo.setEnableZookeeper(InlongConstants.DISABLE_ZK);
pulsarInfo.setEnableCreateResource(InlongConstants.ENABLE_CREATE_RESOURCE);
- pulsarInfo.setLightweight(InlongConstants.STANDARD_MODE);
+ pulsarInfo.setInlongGroupMode(InlongConstants.STANDARD_MODE);
pulsarInfo.setInlongClusterTag("default_cluster");
pulsarInfo.setDailyRecords(10000000);
diff --git
a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/BaseTest.java
b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/BaseTest.java
index 0a46f939c..5c042cff0 100644
---
a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/BaseTest.java
+++
b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/BaseTest.java
@@ -106,10 +106,10 @@ public class BaseTest {
pulsarInfo.setTenant(TENANT);
pulsarInfo.setMqResource(NAMESPACE);
- // set enable zk, create resource, lightweight mode, and cluster tag
+ // set enable zk, create resource, group mode, and cluster tag
pulsarInfo.setEnableZookeeper(InlongConstants.DISABLE_ZK);
pulsarInfo.setEnableCreateResource(InlongConstants.ENABLE_CREATE_RESOURCE);
- pulsarInfo.setLightweight(InlongConstants.LIGHTWEIGHT_MODE);
+ pulsarInfo.setInlongGroupMode(InlongConstants.DATASYNC_MODE);
pulsarInfo.setInlongClusterTag("default_cluster");
pulsarInfo.setDailyRecords(10000000);
diff --git
a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java
b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java
index a3f23746b..68a1f77c8 100644
---
a/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java
+++
b/inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java
@@ -109,7 +109,7 @@ class Kafka2HiveTest extends BaseTest {
"{\"formName\":\"ApplyGroupProcessForm\",\"groupInfo\":{\"mqType\":\"PULSAR\",\"id\":6,"
+
"\"inlongGroupId\":\"test_group009\",\"name\":null,\"description\":null,"
+
"\"mqResource\":\"test_namespace\",\"enableZookeeper\":0,"
- +
"\"enableCreateResource\":1,\"lightweight\":1,"
+ +
"\"enableCreateResource\":1,\"inlongGroupMode\":1,"
+
"\"inlongClusterTag\":\"default_cluster\",\"dailyRecords\":10000000,"
+
"\"dailyStorage\":10000,\"peakRecords\":100000,\"maxLength\":10000,"
+
"\"inCharges\":\"test_inCharges,admin\",\"followers\":null,\"status\":101,"
@@ -161,7 +161,7 @@ class Kafka2HiveTest extends BaseTest {
.formData("{\"formName\":\"ApplyGroupProcessForm\",\"groupInfo\":{\"mqType\":\"PULSAR\","
+
"\"id\":8,\"inlongGroupId\":\"test_group011\",\"name\":null,\"description\":null,"
+
"\"mqResource\":\"test_namespace\",\"enableZookeeper\":0,\"enableCreateResource\":1,"
- +
"\"lightweight\":1,\"inlongClusterTag\":\"default_cluster\","
+ +
"\"inlongGroupMode\":1,\"inlongClusterTag\":\"default_cluster\","
+
"\"dailyRecords\":10000000,\"dailyStorage\":10000,\"peakRecords\":100000,"
+
"\"maxLength\":10000,\"inCharges\":\"test_inCharges,admin\",\"followers\":null,"
+
"\"status\":101,\"creator\":\"admin\",\"modifier\":\"admin\","
@@ -189,7 +189,7 @@ class Kafka2HiveTest extends BaseTest {
pulsarInfo.setMqResource("test_namespace");
pulsarInfo.setEnableZookeeper(0);
pulsarInfo.setEnableCreateResource(1);
- pulsarInfo.setLightweight(1);
+ pulsarInfo.setInlongGroupMode(1);
pulsarInfo.setInlongClusterTag("default_cluster");
pulsarInfo.setInCharges("test_inCharges,admin");
pulsarInfo.setStatus(130);
diff --git
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/CreateCommand.java
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/CreateCommand.java
index 02a0aa5e1..95c000256 100644
---
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/CreateCommand.java
+++
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/CreateCommand.java
@@ -46,7 +46,7 @@ import java.util.Optional;
import static
org.apache.inlong.manager.client.cli.consts.GroupConstants.DEFAULT_DATA_ENCODING;
import static
org.apache.inlong.manager.client.cli.consts.GroupConstants.DEFAULT_DATA_SEPARATOR;
import static
org.apache.inlong.manager.client.cli.consts.GroupConstants.DEFAULT_IGNORE_PARSE_ERROR;
-import static
org.apache.inlong.manager.client.cli.consts.GroupConstants.DEFAULT_LIGHTWEIGHT;
+import static
org.apache.inlong.manager.client.cli.consts.GroupConstants.DEFAULT_INLONG_GROUP_MODE;
import static
org.apache.inlong.manager.common.consts.InlongConstants.ADMIN_USER;
/**
@@ -117,7 +117,7 @@ public class CreateCommand extends AbstractCommand {
String inlongStreamId =
groupConf.getStreamInfo().getInlongStreamId();
// group
groupConf.getGroupInfo().setInCharges(ADMIN_USER);
- groupConf.getGroupInfo().setLightweight(DEFAULT_LIGHTWEIGHT);
+
groupConf.getGroupInfo().setInlongGroupMode(DEFAULT_INLONG_GROUP_MODE);
groupConf.getGroupInfo().setSortConf(new FlinkSortConf());
// stream
diff --git
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/consts/GroupConstants.java
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/consts/GroupConstants.java
index 370cbfc4e..c8a8c6679 100644
---
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/consts/GroupConstants.java
+++
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/consts/GroupConstants.java
@@ -19,7 +19,7 @@ package org.apache.inlong.manager.client.cli.consts;
public class GroupConstants {
- public static final int DEFAULT_LIGHTWEIGHT = 0;
+ public static final int DEFAULT_INLONG_GROUP_MODE = 0;
public static final String DEFAULT_DATA_ENCODING = "UTF-8";
diff --git
a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/impl/InlongGroupImplTest.java
b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/impl/InlongGroupImplTest.java
index 7d6741394..278722c65 100644
---
a/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/impl/InlongGroupImplTest.java
+++
b/inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/impl/InlongGroupImplTest.java
@@ -41,7 +41,7 @@ class InlongGroupImplTest {
+ " \"mqResource\" : \"test_namespace\",\n"
+ " \"enableZookeeper\" : 0,\n"
+ " \"enableCreateResource\" : 1,\n"
- + " \"lightweight\" : 1,\n"
+ + " \"inlongGroupMode\" : 1,\n"
+ " \"inlongClusterTag\" : \"default_cluster\",\n"
+ " \"dailyRecords\" : 10000000,\n"
+ " \"dailyStorage\" : 10000,\n"
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/consts/InlongConstants.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/consts/InlongConstants.java
index 1579bb073..54ef5f816 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/consts/InlongConstants.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/consts/InlongConstants.java
@@ -69,7 +69,7 @@ public class InlongConstants {
public static final Integer DELETED_STATUS = 10;
public static final Integer STANDARD_MODE = 0;
- public static final Integer LIGHTWEIGHT_MODE = 1;
+ public static final Integer DATASYNC_MODE = 1;
public static final Integer DISABLE_ZK = 0;
public static final Integer ENABLE_ZK = 1;
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ErrorCodeEnum.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ErrorCodeEnum.java
index e50c01f8d..b9cb50f8c 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ErrorCodeEnum.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ErrorCodeEnum.java
@@ -56,7 +56,7 @@ public enum ErrorCodeEnum {
GROUP_MIDDLEWARE_UPDATE_NOT_ALLOWED(1011, "The current status does not
support modifying the MQ type"),
GROUP_NAME_UPDATE_NOT_ALLOWED(1012, "The current inlong group status does
not support modifying the name"),
GROUP_INFO_INCONSISTENT(1013, "The inlong group info is inconsistent,
please contact the administrator"),
- GROUP_MODE_UNSUPPORTED(1014, "The current inlong group mode only support
lightweight or standard"),
+ GROUP_MODE_UNSUPPORTED(1014, "The current inlong group mode only support
dataSync or standard"),
OPT_NOT_ALLOWED_BY_STATUS(1021, "InlongGroup status %s was not allowed to
add/update/delete related info"),
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/GroupMode.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/GroupMode.java
index 5ddc5dbaa..6e5b358fe 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/GroupMode.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/GroupMode.java
@@ -31,10 +31,10 @@ public enum GroupMode {
STANDARD("standard"),
/**
- * Lightweight group init with sort in Inlong Cluster
+ * DataSync group init with sort in Inlong Cluster
* StreamSource -> Sort -> StreamSink
*/
- LIGHTWEIGHT("lightweight");
+ DATASYNC("datasync");
@Getter
private final String mode;
diff --git
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/InlongGroupEntity.java
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/InlongGroupEntity.java
index ca7007a8f..54b2b0b90 100644
---
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/InlongGroupEntity.java
+++
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/InlongGroupEntity.java
@@ -42,7 +42,7 @@ public class InlongGroupEntity implements Serializable {
private Integer enableZookeeper;
private Integer enableCreateResource;
- private Integer lightweight;
+ private Integer inlongGroupMode;
private Integer dataReportType;
private String inlongClusterTag;
diff --git
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/InlongGroupEntityMapper.java
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/InlongGroupEntityMapper.java
index 05cb447a5..847828a3d 100644
---
a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/InlongGroupEntityMapper.java
+++
b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/InlongGroupEntityMapper.java
@@ -40,7 +40,7 @@ public interface InlongGroupEntityMapper {
InlongGroupEntity selectByPrimaryKey(Integer id);
List<Map<String, Object>> countGroupByUser(@Param(value = "username")
String username,
- @Param(value = "lightweight") Integer lightweight);
+ @Param(value = "inlongGroupMode") Integer inlongGroupMode);
InlongGroupEntity selectByGroupId(String groupId);
diff --git
a/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
b/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
index 3da8f1956..92430cff4 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
@@ -33,7 +33,7 @@
<result column="max_length" jdbcType="INTEGER" property="maxLength"/>
<result column="enable_zookeeper" jdbcType="INTEGER"
property="enableZookeeper"/>
<result column="enable_create_resource" jdbcType="INTEGER"
property="enableCreateResource"/>
- <result column="lightweight" jdbcType="INTEGER"
property="lightweight"/>
+ <result column="inlong_group_mode" jdbcType="INTEGER"
property="inlongGroupMode"/>
<result column="data_report_type" jdbcType="INTEGER"
property="dataReportType"/>
<result column="inlong_cluster_tag" jdbcType="VARCHAR"
property="inlongClusterTag"/>
<result column="ext_params" jdbcType="LONGVARCHAR"
property="extParams"/>
@@ -57,7 +57,7 @@
<sql id="Base_Column_List">
id, inlong_group_id, name, description, mq_type, mq_resource,
daily_records, daily_storage,
- peak_records, max_length, enable_zookeeper, enable_create_resource,
lightweight, data_report_type,
+ peak_records, max_length, enable_zookeeper, enable_create_resource,
inlong_group_mode, data_report_type,
inlong_cluster_tag, ext_params, in_charges, followers, status,
previous_status, is_deleted,
creator, modifier, create_time, modify_time, version
</sql>
@@ -70,7 +70,7 @@
daily_records, daily_storage,
peak_records, max_length,
enable_zookeeper, enable_create_resource,
- lightweight, data_report_type,
+ inlong_group_mode, data_report_type,
inlong_cluster_tag, ext_params,
in_charges, followers,
status, previous_status,
@@ -81,7 +81,7 @@
#{dailyRecords,jdbcType=INTEGER},
#{dailyStorage,jdbcType=INTEGER},
#{peakRecords,jdbcType=INTEGER}, #{maxLength,jdbcType=INTEGER},
#{enableZookeeper,jdbcType=INTEGER},
#{enableCreateResource,jdbcType=INTEGER},
- #{lightweight,jdbcType=INTEGER},
#{dataReportType,jdbcType=INTEGER},
+ #{inlongGroupMode,jdbcType=INTEGER},
#{dataReportType,jdbcType=INTEGER},
#{inlongClusterTag,jdbcType=VARCHAR},
#{extParams,jdbcType=LONGVARCHAR},
#{inCharges,jdbcType=VARCHAR}, #{followers,jdbcType=VARCHAR},
#{status,jdbcType=INTEGER}, #{previousStatus,jdbcType=INTEGER},
@@ -98,8 +98,8 @@
select count(*) as total, status
from inlong_group
where is_deleted = 0
- <if test="lightweight != null">
- and lightweight = #{lightweight,jdbcType=TINYINT}
+ <if test="inlongGroupMode != null">
+ and inlong_group_mode = #{inlongGroupMode,jdbcType=TINYINT}
</if>
and (creator = #{username,jdbcType=VARCHAR} or
find_in_set(#{username,jdbcType=VARCHAR}, in_charges))
group by status
@@ -157,8 +157,8 @@
#{tag}
</foreach>
</if>
- <if test="lightweight != null">
- and lightweight = #{lightweight,jdbcType=TINYINT}
+ <if test="inlongGroupMode != null">
+ and inlong_group_mode = #{inlongGroupMode,jdbcType=TINYINT}
</if>
</where>
<choose>
@@ -251,7 +251,7 @@
enable_zookeeper = #{enableZookeeper,jdbcType=INTEGER},
enable_create_resource = #{enableCreateResource,jdbcType=INTEGER},
- lightweight = #{lightweight,jdbcType=INTEGER},
+ inlong_group_mode = #{inlongGroupMode,jdbcType=INTEGER},
data_report_type = #{dataReportType,jdbcType=INTEGER},
inlong_cluster_tag = #{inlongClusterTag,jdbcType=VARCHAR},
@@ -299,8 +299,8 @@
<if test="enableCreateResource != null">
enable_create_resource =
#{enableCreateResource,jdbcType=INTEGER},
</if>
- <if test="lightweight != null">
- lightweight = #{lightweight,jdbcType=INTEGER},
+ <if test="inlongGroupMode != null">
+ inlong_group_mode = #{inlongGroupMode,jdbcType=INTEGER},
</if>
<if test="dataReportType != null">
data_report_type = #{dataReportType,jdbcType=INTEGER},
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupInfo.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupInfo.java
index 3a31e82c8..87aa2440a 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupInfo.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupInfo.java
@@ -71,8 +71,8 @@ public abstract class InlongGroupInfo extends BaseInlongGroup
{
@ApiModelProperty(value = "Whether to enable create resource? 0: disable,
1: enable")
private Integer enableCreateResource = 0;
- @ApiModelProperty(value = "Whether to use lightweight mode, 0: no, 1: yes")
- private Integer lightweight;
+ @ApiModelProperty(value = "Standard mode: 0, DataSync mode: 1")
+ private Integer inlongGroupMode;
@ApiModelProperty(value = "Data report type, default is 0.\n"
+ " 0: report to DataProxy and respond when the DataProxy received
data.\n"
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupPageRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupPageRequest.java
index dbf9fd81e..63b6ee959 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupPageRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupPageRequest.java
@@ -57,8 +57,8 @@ public class InlongGroupPageRequest extends PageRequest {
@ApiModelProperty(value = "The inlong cluster tag list")
private List<String> clusterTagList;
- @ApiModelProperty(value = "Standard mode: 0, Lightweight: 1")
- private Integer lightweight;
+ @ApiModelProperty(value = "Standard mode: 0, DataSync mode: 1")
+ private Integer inlongGroupMode;
@ApiModelProperty(value = "Current user", hidden = true)
private String currentUser;
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupRequest.java
index 7869cf092..1dac22a19 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupRequest.java
@@ -85,9 +85,9 @@ public abstract class InlongGroupRequest extends
BaseInlongGroup {
@Range(min = 0, max = 1, message = "default is 1, only supports [0:
disable, 1: enable]")
private Integer enableCreateResource = 1;
- @ApiModelProperty(value = "Whether to use lightweight mode, 0: no, 1: yes")
- @Range(min = 0, max = 1, message = "default is 0, only supports [0: no, 1:
yes]")
- private Integer lightweight = 0;
+ @ApiModelProperty(value = "Standard mode: 0, DataSync mode: 1")
+ @Range(min = 0, max = 1, message = "default is 0, only supports [0:
Standard, 1: DataSync]")
+ private Integer inlongGroupMode = 0;
@ApiModelProperty(value = "Data report type, default is 0.\n"
+ " 0: report to DataProxy and respond when the DataProxy received
data.\n"
diff --git
a/inlong-manager/manager-pojo/src/test/java/org/apache/inlong/manager/pojo/page/PageResultTest.java
b/inlong-manager/manager-pojo/src/test/java/org/apache/inlong/manager/pojo/page/PageResultTest.java
index 0266c22cd..04aef4f38 100644
---
a/inlong-manager/manager-pojo/src/test/java/org/apache/inlong/manager/pojo/page/PageResultTest.java
+++
b/inlong-manager/manager-pojo/src/test/java/org/apache/inlong/manager/pojo/page/PageResultTest.java
@@ -39,13 +39,13 @@ class PageResultTest {
String pageInfoJson =
"{\"total\":30,\"list\":[{\"id\":null,\"inlongGroupId\":\"22\",\"name\":null,"
+
"\"description\":null,\"middlewareType\":null,\"mqType\":\"NONE\",\"mqResource\":null,"
- +
"\"enableZookeeper\":0,\"enableCreateResource\":null,\"lightweight\":null,"
+ +
"\"enableZookeeper\":0,\"enableCreateResource\":null,\"inlongGroupMode\":null,"
+
"\"inlongClusterTag\":null,\"dailyRecords\":null,\"dailyStorage\":null,\"peakRecords\":null,"
+
"\"maxLength\":null,\"inCharges\":null,\"followers\":null,\"status\":null,\"creator\":null,"
+
"\"modifier\":null,\"createTime\":null,\"modifyTime\":null,\"extList\":null,\"sortConf\":null,"
+
"\"version\":44},{\"id\":null,\"inlongGroupId\":null,\"name\":null,\"description\":null,"
+
"\"middlewareType\":null,\"mqType\":\"PULSAR\",\"mqResource\":null,\"enableZookeeper\":0,"
- +
"\"enableCreateResource\":null,\"lightweight\":null,\"inlongClusterTag\":null,"
+ +
"\"enableCreateResource\":null,\"inlongGroupMode\":null,\"inlongClusterTag\":null,"
+
"\"dailyRecords\":null,\"dailyStorage\":null,\"peakRecords\":null,\"maxLength\":null,"
+
"\"inCharges\":null,\"followers\":null,\"status\":null,\"creator\":null,\"modifier\":null,"
+
"\"createTime\":null,\"modifyTime\":null,\"extList\":null,\"sortConf\":null,\"version\":null,"
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupService.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupService.java
index 624571157..9ad67be23 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupService.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupService.java
@@ -89,7 +89,7 @@ public interface InlongGroupService {
* @param operator name of operator
* @return inlong group status statistics
*/
- InlongGroupCountResponse countGroupByUser(String operator, Integer
lightweight);
+ InlongGroupCountResponse countGroupByUser(String operator, Integer
inlongGroupMode);
/**
* According to the group id, query the topic to which it belongs
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
index f88108692..f9ca36765 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
@@ -244,9 +244,9 @@ public class InlongGroupServiceImpl implements
InlongGroupService {
}
@Override
- public InlongGroupCountResponse countGroupByUser(String operator, Integer
lightweight) {
+ public InlongGroupCountResponse countGroupByUser(String operator, Integer
inlongGroupMode) {
InlongGroupCountResponse countVO = new InlongGroupCountResponse();
- List<Map<String, Object>> statusCount =
groupMapper.countGroupByUser(operator, lightweight);
+ List<Map<String, Object>> statusCount =
groupMapper.countGroupByUser(operator, inlongGroupMode);
for (Map<String, Object> map : statusCount) {
int status = (Integer) map.get("status");
long count = (Long) map.get("count");
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/group/InitGroupCompleteListener.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/group/InitGroupCompleteListener.java
index c7175ec86..cb93d2f96 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/group/InitGroupCompleteListener.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/group/InitGroupCompleteListener.java
@@ -89,7 +89,7 @@ public class InitGroupCompleteListener implements
ProcessEventListener {
// update status of other related configs
if
(InlongConstants.DISABLE_CREATE_RESOURCE.equals(groupInfo.getEnableCreateResource()))
{
- if
(InlongConstants.LIGHTWEIGHT_MODE.equals(groupInfo.getLightweight())) {
+ if
(InlongConstants.DATASYNC_MODE.equals(groupInfo.getInlongGroupMode())) {
sourceService.updateStatus(groupId, null,
SourceStatus.SOURCE_NORMAL.getCode(), operator);
} else {
sourceService.updateStatus(groupId, null,
SourceStatus.TO_BE_ISSUED_ADD.getCode(), operator);
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/group/UpdateGroupCompleteListener.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/group/UpdateGroupCompleteListener.java
index 7fe0059f2..c15a83822 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/group/UpdateGroupCompleteListener.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/group/UpdateGroupCompleteListener.java
@@ -80,16 +80,16 @@ public class UpdateGroupCompleteListener implements
ProcessEventListener {
break;
}
- // if the inlong group is lightweight mode, the stream source needs to
be processed.
- if
(InlongConstants.LIGHTWEIGHT_MODE.equals(groupInfo.getLightweight())) {
- changeSource4Lightweight(groupId, operateType, operator);
+ // if the inlong group is dataSync mode, the stream source needs to be
processed.
+ if
(InlongConstants.DATASYNC_MODE.equals(groupInfo.getInlongGroupMode())) {
+ changeSource4DataSync(groupId, operateType, operator);
}
log.info("success to execute UpdateGroupCompleteListener for
groupId={}, operateType={}", groupId, operateType);
return ListenerResult.success();
}
- private void changeSource4Lightweight(String groupId, GroupOperateType
operateType, String operator) {
+ private void changeSource4DataSync(String groupId, GroupOperateType
operateType, String operator) {
switch (operateType) {
case SUSPEND:
sourceService.updateStatus(groupId, null,
SourceStatus.SOURCE_STOP.getCode(), operator);
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/queue/QueueResourceListener.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/queue/QueueResourceListener.java
index c8408420b..3e2091686 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/queue/QueueResourceListener.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/queue/QueueResourceListener.java
@@ -96,7 +96,7 @@ public class QueueResourceListener implements
QueueOperateListener {
return false;
}
GroupResourceProcessForm processForm = (GroupResourceProcessForm)
context.getProcessForm();
- return
InlongConstants.STANDARD_MODE.equals(processForm.getGroupInfo().getLightweight());
+ return
InlongConstants.STANDARD_MODE.equals(processForm.getGroupInfo().getInlongGroupMode());
}
@Override
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/queue/StreamQueueResourceListener.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/queue/StreamQueueResourceListener.java
index 062eaaf59..a17078837 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/queue/StreamQueueResourceListener.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/queue/StreamQueueResourceListener.java
@@ -64,7 +64,7 @@ public class StreamQueueResourceListener implements
QueueOperateListener {
return false;
}
StreamResourceProcessForm streamProcessForm =
(StreamResourceProcessForm) processForm;
- return
InlongConstants.STANDARD_MODE.equals(streamProcessForm.getGroupInfo().getLightweight());
+ return
InlongConstants.STANDARD_MODE.equals(streamProcessForm.getGroupInfo().getInlongGroupMode());
}
@Override
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/source/SourceDeleteListener.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/source/SourceDeleteListener.java
index dc75b70ca..2f1ad535a 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/source/SourceDeleteListener.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/source/SourceDeleteListener.java
@@ -43,7 +43,7 @@ public class SourceDeleteListener extends
AbstractSourceOperateListener {
return false;
}
GroupResourceProcessForm processForm = (GroupResourceProcessForm)
context.getProcessForm();
- return
InlongConstants.STANDARD_MODE.equals(processForm.getGroupInfo().getLightweight())
+ return
InlongConstants.STANDARD_MODE.equals(processForm.getGroupInfo().getInlongGroupMode())
&& processForm.getGroupOperateType() ==
GroupOperateType.DELETE;
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/source/SourceRestartListener.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/source/SourceRestartListener.java
index 54229273d..bb47a4a1b 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/source/SourceRestartListener.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/source/SourceRestartListener.java
@@ -42,7 +42,7 @@ public class SourceRestartListener extends
AbstractSourceOperateListener {
return false;
}
GroupResourceProcessForm processForm = (GroupResourceProcessForm)
context.getProcessForm();
- return
InlongConstants.STANDARD_MODE.equals(processForm.getGroupInfo().getLightweight())
+ return
InlongConstants.STANDARD_MODE.equals(processForm.getGroupInfo().getInlongGroupMode())
&& processForm.getGroupOperateType() ==
GroupOperateType.RESTART;
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/source/SourceStopListener.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/source/SourceStopListener.java
index 7e2aa08f8..731159471 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/source/SourceStopListener.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/source/SourceStopListener.java
@@ -42,7 +42,7 @@ public class SourceStopListener extends
AbstractSourceOperateListener {
return false;
}
GroupResourceProcessForm processForm = (GroupResourceProcessForm)
context.getProcessForm();
- return
InlongConstants.STANDARD_MODE.equals(processForm.getGroupInfo().getLightweight())
+ return
InlongConstants.STANDARD_MODE.equals(processForm.getGroupInfo().getInlongGroupMode())
&& processForm.getGroupOperateType() ==
GroupOperateType.SUSPEND;
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/stream/InitStreamCompleteListener.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/stream/InitStreamCompleteListener.java
index 2796bde0b..dc22fca19 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/stream/InitStreamCompleteListener.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/stream/InitStreamCompleteListener.java
@@ -65,7 +65,7 @@ public class InitStreamCompleteListener implements
ProcessEventListener {
// Update status of other related configs
streamService.updateStatus(groupId, streamId,
StreamStatus.CONFIG_SUCCESSFUL.getCode(), operator);
streamService.updateWithoutCheck(streamInfo.genRequest(),
operator);
- if
(InlongConstants.LIGHTWEIGHT_MODE.equals(form.getGroupInfo().getLightweight()))
{
+ if
(InlongConstants.DATASYNC_MODE.equals(form.getGroupInfo().getInlongGroupMode()))
{
sourceService.updateStatus(groupId, streamId,
SourceStatus.SOURCE_NORMAL.getCode(), operator);
} else {
sourceService.updateStatus(groupId, streamId,
SourceStatus.TO_BE_ISSUED_ADD.getCode(), operator);
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sort/DefaultSortConfigOperator.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sort/DefaultSortConfigOperator.java
index 2f9d16082..c9662b883 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sort/DefaultSortConfigOperator.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/resource/sort/DefaultSortConfigOperator.java
@@ -134,7 +134,7 @@ public class DefaultSortConfigOperator implements
SortConfigOperator {
}
List<NodeRelation> relations;
- if
(InlongConstants.STANDARD_MODE.equals(groupInfo.getLightweight())) {
+ if
(InlongConstants.STANDARD_MODE.equals(groupInfo.getInlongGroupMode())) {
if (CollectionUtils.isNotEmpty(transformResponses)) {
relations =
NodeRelationUtils.createNodeRelations(inlongStream);
// in standard mode, replace upstream source node and
transform input fields node
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/AbstractSourceOperator.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/AbstractSourceOperator.java
index 6c3cf4442..7e6ac8df8 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/AbstractSourceOperator.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/AbstractSourceOperator.java
@@ -130,7 +130,7 @@ public abstract class AbstractSourceOperator implements
StreamSourceOperator {
updateFieldOpt(entity, request.getFieldList());
return;
}
- boolean allowUpdate =
InlongConstants.LIGHTWEIGHT_MODE.equals(groupMode)
+ boolean allowUpdate = InlongConstants.DATASYNC_MODE.equals(groupMode)
|| SourceStatus.ALLOWED_UPDATE.contains(entity.getStatus());
if (!allowUpdate) {
throw new BusinessException(ErrorCodeEnum.SOURCE_OPT_NOT_ALLOWED,
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/StreamSourceService.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/StreamSourceService.java
index 82868053b..1b2333fe8 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/StreamSourceService.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/StreamSourceService.java
@@ -80,7 +80,7 @@ public interface StreamSourceService {
/**
* Get the StreamSource Map by the inlong group info and inlong stream
info list.
* <p/>
- * If the group mode is LIGHTWEIGHT, means not using any MQ as a cached
source, then just get all related sources.
+ * If the group mode is DATASYNC, means not using any MQ as a cached
source, then just get all related sources.
* Otherwise, if the group mode is STANDARD, need get the cached MQ
sources.
*
* @param groupInfo inlong group info
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/StreamSourceServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/StreamSourceServiceImpl.java
index 1419b9e74..eeaadde83 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/StreamSourceServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/source/StreamSourceServiceImpl.java
@@ -230,9 +230,9 @@ public class StreamSourceServiceImpl implements
StreamSourceService {
LOGGER.debug("begin to get source map for groupId={}", groupId);
Map<String, List<StreamSource>> result;
- // if the group mode is LIGHTWEIGHT, just get all related stream
sources
+ // if the group mode is DATASYNC, just get all related stream sources
List<StreamSource> streamSources = this.listSource(groupId, null);
- if
(InlongConstants.LIGHTWEIGHT_MODE.equals(groupInfo.getLightweight())) {
+ if
(InlongConstants.DATASYNC_MODE.equals(groupInfo.getInlongGroupMode())) {
result = streamSources.stream()
.collect(Collectors.groupingBy(StreamSource::getInlongStreamId, HashMap::new,
Collectors.toCollection(ArrayList::new)));
@@ -349,7 +349,7 @@ public class StreamSourceServiceImpl implements
StreamSourceService {
if (CollectionUtils.isNotEmpty(streamFields)) {
streamFields.forEach(streamField -> streamField.setId(null));
}
- sourceOperator.updateOpt(request, groupEntity.getStatus(),
groupEntity.getLightweight(), operator);
+ sourceOperator.updateOpt(request, groupEntity.getStatus(),
groupEntity.getInlongGroupMode(), operator);
LOGGER.info("success to update source info: {}", request);
return true;
@@ -381,7 +381,7 @@ public class StreamSourceServiceImpl implements
StreamSourceService {
if (CollectionUtils.isNotEmpty(streamFields)) {
streamFields.forEach(streamField -> streamField.setId(null));
}
- sourceOperator.updateOpt(request, groupEntity.getStatus(),
groupEntity.getLightweight(), opInfo.getName());
+ sourceOperator.updateOpt(request, groupEntity.getStatus(),
groupEntity.getInlongGroupMode(), opInfo.getName());
return true;
}
diff --git
a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/mocks/MockDeleteSourceListener.java
b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/mocks/MockDeleteSourceListener.java
index 67699539f..6b840b399 100644
---
a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/mocks/MockDeleteSourceListener.java
+++
b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/mocks/MockDeleteSourceListener.java
@@ -41,7 +41,7 @@ public class MockDeleteSourceListener implements
SourceOperateListener {
return false;
}
GroupResourceProcessForm processForm = (GroupResourceProcessForm)
context.getProcessForm();
- return
InlongConstants.STANDARD_MODE.equals(processForm.getGroupInfo().getLightweight())
+ return
InlongConstants.STANDARD_MODE.equals(processForm.getGroupInfo().getInlongGroupMode())
&& processForm.getGroupOperateType() ==
GroupOperateType.DELETE;
}
diff --git
a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/mocks/MockRestartSourceListener.java
b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/mocks/MockRestartSourceListener.java
index 2fa961685..96bf3dd6a 100644
---
a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/mocks/MockRestartSourceListener.java
+++
b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/mocks/MockRestartSourceListener.java
@@ -41,7 +41,7 @@ public class MockRestartSourceListener implements
SourceOperateListener {
return false;
}
GroupResourceProcessForm processForm = (GroupResourceProcessForm)
context.getProcessForm();
- return
InlongConstants.STANDARD_MODE.equals(processForm.getGroupInfo().getLightweight())
+ return
InlongConstants.STANDARD_MODE.equals(processForm.getGroupInfo().getInlongGroupMode())
&& processForm.getGroupOperateType() ==
GroupOperateType.RESTART;
}
diff --git
a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/mocks/MockStopSourceListener.java
b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/mocks/MockStopSourceListener.java
index 631171de0..e101451e9 100644
---
a/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/mocks/MockStopSourceListener.java
+++
b/inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/mocks/MockStopSourceListener.java
@@ -41,7 +41,7 @@ public class MockStopSourceListener implements
SourceOperateListener {
return false;
}
GroupResourceProcessForm processForm = (GroupResourceProcessForm)
context.getProcessForm();
- return
InlongConstants.STANDARD_MODE.equals(processForm.getGroupInfo().getLightweight())
+ return
InlongConstants.STANDARD_MODE.equals(processForm.getGroupInfo().getInlongGroupMode())
&& processForm.getGroupOperateType() ==
GroupOperateType.SUSPEND;
}
diff --git
a/inlong-manager/manager-test/src/main/resources/h2/apache_inlong_manager.sql
b/inlong-manager/manager-test/src/main/resources/h2/apache_inlong_manager.sql
index 8b2cc004f..431addf08 100644
---
a/inlong-manager/manager-test/src/main/resources/h2/apache_inlong_manager.sql
+++
b/inlong-manager/manager-test/src/main/resources/h2/apache_inlong_manager.sql
@@ -35,7 +35,7 @@ CREATE TABLE IF NOT EXISTS `inlong_group`
`max_length` int(11) DEFAULT '10240' COMMENT
'The maximum length of a single piece of data, unit: Byte',
`enable_zookeeper` tinyint(1) DEFAULT '0' COMMENT
'Whether to enable the zookeeper, 0-disable, 1-enable',
`enable_create_resource` tinyint(1) DEFAULT '1' COMMENT
'Whether to enable create resource? 0-disable, 1-enable',
- `lightweight` tinyint(1) DEFAULT '0' COMMENT
'Whether to use lightweight mode, 0-no, 1-yes',
+ `inlong_group_mode` tinyint(1) DEFAULT '0' COMMENT 'Inlong
group mode, Standard mode: 0, DataSync mode: 1',
`data_report_type` int(4) DEFAULT '0' COMMENT 'Data
report type. 0: report to DataProxy and respond when the DataProxy received
data. 1: report to DataProxy and respond after DataProxy sends data. 2: report
to MQ and respond when the MQ received data',
`inlong_cluster_tag` varchar(128) DEFAULT NULL COMMENT 'The
cluster tag, which links to inlong_cluster table',
`ext_params` mediumtext DEFAULT NULL COMMENT
'Extended params, will be saved as JSON string',
diff --git a/inlong-manager/manager-web/sql/apache_inlong_manager.sql
b/inlong-manager/manager-web/sql/apache_inlong_manager.sql
index 62995264b..a8d279928 100644
--- a/inlong-manager/manager-web/sql/apache_inlong_manager.sql
+++ b/inlong-manager/manager-web/sql/apache_inlong_manager.sql
@@ -41,7 +41,7 @@ CREATE TABLE IF NOT EXISTS `inlong_group`
`max_length` int(11) DEFAULT '10240' COMMENT
'The maximum length of a single piece of data, unit: Byte',
`enable_zookeeper` tinyint(1) DEFAULT '0' COMMENT
'Whether to enable the zookeeper, 0-disable, 1-enable',
`enable_create_resource` tinyint(1) DEFAULT '1' COMMENT
'Whether to enable create resource? 0-disable, 1-enable',
- `lightweight` tinyint(1) DEFAULT '0' COMMENT
'Whether to use lightweight mode, 0-no, 1-yes',
+ `inlong_group_mode` tinyint(1) DEFAULT '0' COMMENT 'Inlong
group mode, Standard mode: 0, DataSync mode: 1',
`data_report_type` int(4) DEFAULT '0' COMMENT 'Data
report type. 0: report to DataProxy and respond when the DataProxy received
data. 1: report to DataProxy and respond after DataProxy sends data. 2: report
to MQ and respond when the MQ received data',
`inlong_cluster_tag` varchar(128) DEFAULT NULL COMMENT 'The
cluster tag, which links to inlong_cluster table',
`ext_params` mediumtext DEFAULT NULL COMMENT
'Extended params, will be saved as JSON string',
diff --git
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/consts/GroupConstants.java
b/inlong-manager/manager-web/sql/changes-1.8.0.sql
similarity index 65%
copy from
inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/consts/GroupConstants.java
copy to inlong-manager/manager-web/sql/changes-1.8.0.sql
index 370cbfc4e..5f3692644 100644
---
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/consts/GroupConstants.java
+++ b/inlong-manager/manager-web/sql/changes-1.8.0.sql
@@ -15,17 +15,13 @@
* limitations under the License.
*/
-package org.apache.inlong.manager.client.cli.consts;
+-- This is the SQL change file from version 1.7.0 to the current version 1.8.0.
+-- When upgrading to version 1.8.0, please execute those SQLs in the DB (such
as MySQL) used by the Manager module.
-public class GroupConstants {
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
- public static final int DEFAULT_LIGHTWEIGHT = 0;
+USE `apache_inlong_manager`;
- public static final String DEFAULT_DATA_ENCODING = "UTF-8";
-
- // int value of '|'
- public static final String DEFAULT_DATA_SEPARATOR = "124";
-
- public static final boolean DEFAULT_IGNORE_PARSE_ERROR = true;
-
-}
+ALTER TABLE inlong_group
+ CHANGE lightweight inlong_group_mode tinyint(1) DEFAULT 0 NULL COMMENT
'Inlong group mode, Standard mode: 0, DataSync mode: 1';
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongGroupController.java
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongGroupController.java
index f1d81090f..c91a19773 100644
---
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongGroupController.java
+++
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongGroupController.java
@@ -89,11 +89,11 @@ public class InlongGroupController {
@RequestMapping(value = "/group/countByStatus", method = RequestMethod.GET)
@ApiOperation(value = "Count inlong group status for current user")
- @ApiImplicitParam(name = "lightweight", dataTypeClass = Integer.class,
defaultValue = "0")
+ @ApiImplicitParam(name = "inlongGroupMode", dataTypeClass = Integer.class,
defaultValue = "0")
public Response<InlongGroupCountResponse> countGroupByUser(
- @RequestParam(required = false, defaultValue = "0") Integer
lightweight) {
+ @RequestParam(required = false, defaultValue = "0") Integer
inlongGroupMode) {
String operator = LoginUserUtils.getLoginUser().getName();
- return Response.success(groupService.countGroupByUser(operator,
lightweight));
+ return Response.success(groupService.countGroupByUser(operator,
inlongGroupMode));
}
@GetMapping(value = "/group/getTopic/{groupId}")
diff --git
a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/configuration/Configuration.java
b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/configuration/Configuration.java
index 02f066b33..7dea7ecb8 100644
---
a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/configuration/Configuration.java
+++
b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/configuration/Configuration.java
@@ -17,7 +17,8 @@
package org.apache.inlong.sort.configuration;
-import static com.google.common.base.Preconditions.checkNotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Arrays;
import java.util.HashMap;
@@ -26,11 +27,11 @@ import java.util.Locale;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import static com.google.common.base.Preconditions.checkNotNull;
/**
- * Lightweight configuration object which stores key/value pairs.
+ * DataSync configuration object which stores key/value pairs.
*
* <p>Copied from Flink project(org.apache.flink/flink-core) with a bit of
changing.</p>
*/
diff --git
a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/configuration/Constants.java
b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/configuration/Constants.java
index d14127dde..209443602 100644
---
a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/configuration/Constants.java
+++
b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/configuration/Constants.java
@@ -319,8 +319,8 @@ public class Constants {
public static final String CHDFS_CONFIG_PREFIX = "fs.ofs.";
- public static final ConfigOption<Boolean> LIGHTWEIGHT =
key("lightweight").defaultValue(false)
- .withDescription("Whether to lightweight or not");
+ public static final ConfigOption<Boolean> DATASYNC =
key("datasync").defaultValue(false)
+ .withDescription("Whether to datasync or not");
public static final ConfigOption<String> GROUP_INFO_FILE =
key("group.info.file").noDefaultValue()
.withDescription("The file which contains group info for a single
tenant job");
