You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2021/11/01 06:58:28 UTC
[incubator-inlong] branch master updated (43bea69 -> e43a1dc)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git.
from 43bea69 [INLONG-1726][Feature] [InLong-Website] Adapt the Manager module and modify the field names of bid and dsid (#1728)
add e43a1dc [INLONG-1725][Feature] [InLong-Manager] Modify bid and tid (or dsid) to inlongGroupId and inlongStreamId (#1727)
No new revisions were added by this update.
Summary of changes:
.../docker-compose/sql/apache_inlong_manager.sql | 526 +++++++++----------
inlong-manager/doc/sql/apache_inlong_manager.sql | 563 +++++++++++----------
.../inlong/manager/common/enums/BizConstant.java | 4 +-
.../manager/common/pojo/agent/DataConfig.java | 4 +-
.../common/pojo/agent/FileAgentTaskConfig.java | 4 +-
.../common/pojo/business/BusinessApproveInfo.java | 4 +-
.../common/pojo/business/BusinessExtInfo.java | 4 +-
.../manager/common/pojo/business/BusinessInfo.java | 4 +-
.../common/pojo/business/BusinessListVO.java | 4 +-
.../common/pojo/business/BusinessTopicVO.java | 4 +-
.../pojo/dataconsumption/ConsumptionInfo.java | 12 +-
.../pojo/dataconsumption/ConsumptionListVo.java | 4 +-
.../pojo/dataconsumption/ConsumptionQuery.java | 10 +-
.../common/pojo/datasource/SourceDbBasicInfo.java | 8 +-
.../common/pojo/datasource/SourceDbDetailInfo.java | 8 +-
.../pojo/datasource/SourceDbDetailListVO.java | 4 +-
.../pojo/datasource/SourceDbDetailPageRequest.java | 4 +-
.../pojo/datasource/SourceFileBasicInfo.java | 4 +-
.../pojo/datasource/SourceFileDetailInfo.java | 6 +-
.../pojo/datasource/SourceFileDetailListVO.java | 4 +-
.../datasource/SourceFileDetailPageRequest.java | 4 +-
.../common/pojo/datastorage/BaseStorageInfo.java | 6 +-
.../common/pojo/datastorage/BaseStorageListVO.java | 8 +-
.../pojo/datastorage/StoragePageRequest.java | 8 +-
.../pojo/datastorage/StorageSummaryInfo.java | 8 +-
.../pojo/datastream/DataStreamApproveInfo.java | 6 +-
.../common/pojo/datastream/DataStreamBaseInfo.java | 8 +-
.../common/pojo/datastream/DataStreamExtInfo.java | 8 +-
.../pojo/datastream/DataStreamFieldInfo.java | 6 +-
.../datastream/DataStreamInfoToHiveConfig.java | 4 +-
.../common/pojo/datastream/DataStreamListVO.java | 8 +-
.../pojo/datastream/DataStreamPageRequest.java | 6 +-
.../pojo/datastream/DataStreamSummaryInfo.java | 8 +-
.../pojo/datastream/FullDataStreamPageRequest.java | 43 --
.../inlong/manager/dao/entity/BusinessEntity.java | 2 +-
.../manager/dao/entity/BusinessExtEntity.java | 2 +-
.../manager/dao/entity/ConsumptionEntity.java | 4 +-
.../inlong/manager/dao/entity/DataProxyConfig.java | 2 +-
.../manager/dao/entity/DataStreamEntity.java | 4 +-
.../manager/dao/entity/DataStreamExtEntity.java | 4 +-
.../manager/dao/entity/DataStreamFieldEntity.java | 4 +-
.../manager/dao/entity/SourceDbBasicEntity.java | 4 +-
.../manager/dao/entity/SourceDbDetailEntity.java | 4 +-
.../manager/dao/entity/SourceFileBasicEntity.java | 4 +-
.../manager/dao/entity/SourceFileDetailEntity.java | 4 +-
.../manager/dao/entity/StorageHiveEntity.java | 4 +-
.../manager/dao/mapper/BusinessEntityMapper.java | 6 +-
.../dao/mapper/BusinessExtEntityMapper.java | 10 +-
.../manager/dao/mapper/DataStreamEntityMapper.java | 27 +-
.../dao/mapper/DataStreamExtEntityMapper.java | 16 +-
.../dao/mapper/DataStreamFieldEntityMapper.java | 14 +-
.../dao/mapper/SourceDbBasicEntityMapper.java | 10 +-
.../dao/mapper/SourceDbDetailEntityMapper.java | 14 +-
.../dao/mapper/SourceFileBasicEntityMapper.java | 10 +-
.../dao/mapper/SourceFileDetailEntityMapper.java | 25 +-
.../dao/mapper/StorageHiveEntityMapper.java | 28 +-
.../dao/mapper/StorageHiveFieldEntityMapper.java | 2 +-
.../resources/mappers/BusinessEntityMapper.xml | 72 +--
.../resources/mappers/BusinessExtEntityMapper.xml | 54 +-
.../main/resources/mappers/ClusterSetMapper.xml | 4 +-
.../resources/mappers/ConsumptionEntityMapper.xml | 100 ++--
.../resources/mappers/DataStreamEntityMapper.xml | 130 +++--
.../mappers/DataStreamExtEntityMapper.xml | 72 +--
.../mappers/DataStreamFieldEntityMapper.xml | 83 ++-
.../src/main/resources/mappers/EventLogMapper.xml | 37 +-
.../mappers/ProcessInstanceEntityMapper.xml | 82 +--
.../mappers/SourceDbBasicEntityMapper.xml | 65 ++-
.../mappers/SourceDbDetailEntityMapper.xml | 98 ++--
.../mappers/SourceFileBasicEntityMapper.xml | 100 ++--
.../mappers/SourceFileDetailEntityMapper.xml | 129 +++--
.../resources/mappers/StorageHiveEntityMapper.xml | 127 +++--
.../mappers/StorageHiveFieldEntityMapper.xml | 6 +-
.../test/resources/sql/apache_inlong_manager.sql | 60 +--
.../manager/service/core/BusinessService.java | 26 +-
.../manager/service/core/DataStreamService.java | 61 ++-
.../manager/service/core/SourceDbService.java | 26 +-
.../manager/service/core/SourceFileService.java | 24 +-
.../manager/service/core/StorageService.java | 42 +-
.../service/core/impl/AgentTaskServiceImpl.java | 12 +-
.../core/impl/BusinessProcessOperation.java | 16 +-
.../service/core/impl/BusinessServiceImpl.java | 108 ++--
.../service/core/impl/ConsumptionServiceImpl.java | 6 +-
.../service/core/impl/DataStreamServiceImpl.java | 323 ++++++------
.../service/core/impl/SourceDbServiceImpl.java | 117 ++---
.../service/core/impl/SourceFileServiceImpl.java | 112 ++--
.../service/core/impl/StorageBaseOperation.java | 26 +-
.../service/core/impl/StorageHiveOperation.java | 34 +-
.../service/core/impl/StorageServiceImpl.java | 98 ++--
.../repository/DataProxyConfigRepository.java | 97 +---
.../hive/CreateHiveTableForAllStreamListener.java | 10 +-
.../hive/CreateHiveTableForOneStreamListener.java | 12 +-
.../service/thirdpart/hive/HiveTableOperator.java | 18 +-
.../CreateTubeConsumeGroupTaskEventListener.java | 12 +-
.../mq/CreateTubeTopicTaskEventListener.java | 10 +-
.../sort/PushHiveConfigToSortEventListener.java | 14 +-
.../service/workflow/WorkflowServiceImpl.java | 4 +-
.../workflow/WorkflowTaskExecuteLogQuery.java | 2 +-
.../CreateResourceWorkflowDefinition.java | 16 +-
.../newbusiness/CreateResourceWorkflowForm.java | 16 +-
.../newbusiness/NewBusinessWorkflowForm.java | 6 +-
.../listener/ApproveCancelProcessListener.java | 4 +-
.../listener/ApproveRejectProcessListener.java | 4 +-
.../CreateResourceCompleteProcessListener.java | 6 +-
.../CreateResourceFailedProcessListener.java | 6 +-
.../listener/InitBusinessInfoListener.java | 2 +-
.../StartCreateResourceProcessListener.java | 4 +-
.../NewConsumptionWorkflowDefinition.java | 2 +-
.../newconsumption/NewConsumptionWorkflowForm.java | 4 +-
.../InitBusinessInfoForStreamListener.java | 2 +-
.../SingleStreamCompleteProcessListener.java | 10 +-
.../SingleStreamFailedProcessListener.java | 8 +-
.../newstream/SingleStreamWorkflowDefinition.java | 15 +-
.../manager/web/controller/BusinessController.java | 40 +-
.../web/controller/ConsumptionController.java | 6 +-
.../web/controller/DataStreamController.java | 38 +-
.../manager/web/controller/SourceDbController.java | 10 +-
.../web/controller/SourceFileController.java | 10 +-
.../service/workflow/WorkflowServiceTest.java | 6 +-
.../org/apache/inlong/manager/web/UtilsTest.java | 8 +-
.../test/resources/sql/apache_inlong_manager.sql | 66 +--
.../workflow/core/event/LogableEventListener.java | 2 +-
.../core/processor/StartEventProcessor.java | 2 +-
.../workflow/model/definition/ProcessForm.java | 6 +-
.../manager/workflow/model/instance/EventLog.java | 8 +-
.../workflow/model/instance/ProcessInstance.java | 10 +-
.../manager/workflow/model/view/EventLogQuery.java | 11 +-
.../manager/workflow/model/view/EventLogView.java | 2 +-
.../workflow/model/view/ProcessListView.java | 52 +-
.../manager/workflow/model/view/ProcessQuery.java | 16 +-
.../workflow/model/view/ProcessSummaryQuery.java | 18 +-
.../manager/workflow/model/view/ProcessView.java | 53 +-
131 files changed, 2147 insertions(+), 2271 deletions(-)
delete mode 100644 inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/datastream/FullDataStreamPageRequest.java