[INLONG-8047][Manager][Sort] Rename lightweight to dataSync

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,
     },
   });
 

inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/BaseExample.java

@@ -74,10 +74,10 @@ public InlongGroupInfo createGroupInfo() {
         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);

inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/BaseTest.java

@@ -106,10 +106,10 @@ public static InlongGroupInfo createGroupInfo() {
         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);

inlong-manager/manager-client-examples/src/test/java/org/apache/inlong/manager/client/ut/Kafka2HiveTest.java

@@ -109,7 +109,7 @@ static void createStub() {
                                 "{\"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 @@ static void createStub() {
                         .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 @@ static void createStub() {
         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);

inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/CreateCommand.java

@@ -46,7 +46,7 @@
 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 @@ private void setDefaultConfigInfo(CreateGroupConf groupConf) {
             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

inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/consts/GroupConstants.java

@@ -19,7 +19,7 @@
 
 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";
 

inlong-manager/manager-client/src/test/java/org/apache/inlong/manager/client/api/impl/InlongGroupImplTest.java

@@ -41,7 +41,7 @@ void testParseForm() {
                 + "    \"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"

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;

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"),
 

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;

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;
 

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);
 

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},

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"

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;

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"

inlong-manager/manager-pojo/src/test/java/org/apache/inlong/manager/pojo/page/PageResultTest.java

@@ -39,13 +39,13 @@ void testDeserializePageInfoFromWeb() {
 
         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,"

inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupService.java

@@ -89,7 +89,7 @@ String save(@Valid @NotNull(message = "inlong group request cannot be null") Inl
      * @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

inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java

@@ -244,9 +244,9 @@ public InlongGroupInfo get(String groupId, UserInfo opInfo) {
     }
 
     @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");

inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/group/InitGroupCompleteListener.java

@@ -89,7 +89,7 @@ public ListenerResult listen(WorkflowContext context) throws WorkflowListenerExc
 
             // 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);

inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/group/UpdateGroupCompleteListener.java

@@ -80,16 +80,16 @@ public ListenerResult listen(WorkflowContext context) {
                 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);

inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/queue/QueueResourceListener.java

@@ -96,7 +96,7 @@ public boolean accept(WorkflowContext context) {
             return false;
         }
         GroupResourceProcessForm processForm = (GroupResourceProcessForm) context.getProcessForm();
-        return InlongConstants.STANDARD_MODE.equals(processForm.getGroupInfo().getLightweight());
+        return InlongConstants.STANDARD_MODE.equals(processForm.getGroupInfo().getInlongGroupMode());
     }
 
     @Override

inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/queue/StreamQueueResourceListener.java

@@ -64,7 +64,7 @@ public boolean accept(WorkflowContext context) {
             return false;
         }
         StreamResourceProcessForm streamProcessForm = (StreamResourceProcessForm) processForm;
-        return InlongConstants.STANDARD_MODE.equals(streamProcessForm.getGroupInfo().getLightweight());
+        return InlongConstants.STANDARD_MODE.equals(streamProcessForm.getGroupInfo().getInlongGroupMode());
     }
 
     @Override

inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/source/SourceDeleteListener.java

@@ -43,7 +43,7 @@ public boolean accept(WorkflowContext context) {
             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;
     }