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/inlong.git
from aec7f658a [INLONG-5303][TubeMQ] Simplify MsgFileStore code (#5304)
add bee8d868a [INLONG-5305][Manager] Change the type enum that needs to be
extended to a string constant (#5306)
No new revisions were added by this update.
Summary of changes:
.../client/api/inner/ClientFactoryTest.java | 56 ++++++++-------
.../inlong/manager/common/consts/DataNodeType.java | 24 +++----
.../{enums/ClusterType.java => consts/MQType.java} | 14 ++--
.../inlong/manager/common/consts/SinkType.java | 40 +++++++++++
.../inlong/manager/common/consts/SourceType.java | 61 ++++++++++++++++
.../inlong/manager/common/enums/DataNodeType.java | 36 ----------
.../inlong/manager/common/enums/ErrorCodeEnum.java | 6 +-
.../apache/inlong/manager/common/enums/MQType.java | 54 --------------
.../inlong/manager/common/enums/SinkType.java | 73 -------------------
.../inlong/manager/common/enums/SourceType.java | 84 ----------------------
.../pojo/cluster/tubemq/TubeClusterDTO.java | 6 +-
.../pojo/cluster/tubemq/TubeClusterInfo.java | 8 +--
.../pojo/cluster/tubemq/TubeClusterRequest.java | 8 +--
.../manager/pojo/consumption/ConsumptionInfo.java | 2 +-
.../pojo/consumption/ConsumptionListVo.java | 2 +-
.../pojo/consumption/ConsumptionPulsarInfo.java | 4 +-
.../manager/pojo/consumption/ConsumptionQuery.java | 2 +-
.../pojo/group/InlongGroupApproveRequest.java | 2 +-
.../manager/pojo/group/InlongGroupBriefInfo.java | 2 +-
.../inlong/manager/pojo/group/InlongGroupInfo.java | 4 +-
.../manager/pojo/group/InlongGroupRequest.java | 6 +-
.../manager/pojo/group/InlongGroupTopicInfo.java | 8 +--
.../manager/pojo/group/none/InlongNoneMqInfo.java | 6 +-
.../pojo/group/none/InlongNoneMqRequest.java | 6 +-
.../pojo/group/pulsar/InlongPulsarInfo.java | 6 +-
.../pojo/group/pulsar/InlongPulsarRequest.java | 6 +-
.../pojo/group/pulsar/InlongTdmqPulsarInfo.java | 6 +-
.../pojo/group/pulsar/InlongTdmqPulsarRequest.java | 6 +-
.../pojo/group/tubemq/InlongTubeMQInfo.java | 6 +-
.../pojo/group/tubemq/InlongTubeMQRequest.java | 8 +--
.../queue/tubemq/AddTubeConsumeGroupRequest.java | 2 +-
.../pojo/queue/tubemq/AddTubeMqTopicRequest.java | 47 ------------
.../pojo/queue/tubemq/QueryTubeTopicRequest.java | 34 ---------
.../pojo/queue/tubemq/TubeHttpResponse.java | 2 +-
.../manager/pojo/sink/ck/ClickHouseSink.java | 6 +-
.../pojo/sink/ck/ClickHouseSinkRequest.java | 4 +-
.../pojo/sink/dlciceberg/DLCIcebergSink.java | 6 +-
.../sink/dlciceberg/DLCIcebergSinkRequest.java | 4 +-
.../manager/pojo/sink/es/ElasticsearchSink.java | 6 +-
.../pojo/sink/es/ElasticsearchSinkRequest.java | 4 +-
.../manager/pojo/sink/greenplum/GreenplumSink.java | 6 +-
.../pojo/sink/greenplum/GreenplumSinkRequest.java | 4 +-
.../inlong/manager/pojo/sink/hbase/HBaseSink.java | 6 +-
.../manager/pojo/sink/hbase/HBaseSinkRequest.java | 4 +-
.../inlong/manager/pojo/sink/hdfs/HDFSSink.java | 6 +-
.../manager/pojo/sink/hdfs/HDFSSinkRequest.java | 4 +-
.../inlong/manager/pojo/sink/hive/HiveSink.java | 6 +-
.../manager/pojo/sink/hive/HiveSinkRequest.java | 4 +-
.../manager/pojo/sink/iceberg/IcebergSink.java | 6 +-
.../pojo/sink/iceberg/IcebergSinkRequest.java | 4 +-
.../inlong/manager/pojo/sink/kafka/KafkaSink.java | 6 +-
.../manager/pojo/sink/kafka/KafkaSinkRequest.java | 4 +-
.../inlong/manager/pojo/sink/mysql/MySQLSink.java | 6 +-
.../manager/pojo/sink/mysql/MySQLSinkRequest.java | 4 +-
.../manager/pojo/sink/oracle/OracleSink.java | 6 +-
.../pojo/sink/oracle/OracleSinkRequest.java | 4 +-
.../pojo/sink/postgresql/PostgreSQLSink.java | 6 +-
.../sink/postgresql/PostgreSQLSinkRequest.java | 4 +-
.../manager/pojo/sink/sqlserver/SQLServerSink.java | 6 +-
.../pojo/sink/sqlserver/SQLServerSinkRequest.java | 4 +-
.../sink/tdsqlpostgresql/TDSQLPostgreSQLSink.java | 6 +-
.../TDSQLPostgreSQLSinkRequest.java | 4 +-
.../manager/pojo/sort/util/ExtractNodeUtils.java | 20 +++---
.../manager/pojo/sort/util/LoadNodeUtils.java | 32 ++++-----
.../pojo/source/autopush/AutoPushSource.java | 6 +-
.../source/autopush/AutoPushSourceRequest.java | 8 +--
.../manager/pojo/source/file/FileSource.java | 10 +--
.../pojo/source/file/FileSourceRequest.java | 8 +--
.../manager/pojo/source/kafka/KafkaSource.java | 6 +-
.../pojo/source/kafka/KafkaSourceRequest.java | 8 +--
.../manager/pojo/source/mongodb/MongoDBSource.java | 10 +--
.../pojo/source/mongodb/MongoDBSourceRequest.java | 8 +--
.../pojo/source/mysql/MySQLBinlogSource.java | 10 +--
.../source/mysql/MySQLBinlogSourceRequest.java | 6 +-
.../manager/pojo/source/oracle/OracleSource.java | 10 +--
.../pojo/source/oracle/OracleSourceRequest.java | 8 +--
.../pojo/source/postgresql/PostgreSQLSource.java | 6 +-
.../source/postgresql/PostgreSQLSourceRequest.java | 8 +--
.../manager/pojo/source/pulsar/PulsarSource.java | 10 +--
.../pojo/source/pulsar/PulsarSourceRequest.java | 8 +--
.../pojo/source/sqlserver/SQLServerSource.java | 10 +--
.../source/sqlserver/SQLServerSourceRequest.java | 8 +--
.../manager/pojo/source/tubemq/TubeMQSource.java | 10 +--
.../pojo/source/tubemq/TubeMQSourceRequest.java | 13 ++--
.../manager/pojo/stream/InlongStreamInfo.java | 2 +-
.../service/cluster/InlongClusterServiceImpl.java | 8 +--
.../service/cluster/TubeClusterOperator.java | 6 +-
.../service/core/impl/AgentServiceImpl.java | 18 +++--
.../core/impl/ConsumptionProcessService.java | 16 ++---
.../service/core/impl/ConsumptionServiceImpl.java | 49 +++++++------
.../service/core/impl/DataNodeServiceImpl.java | 10 +--
.../service/core/impl/SortSourceServiceImpl.java | 13 ++--
.../manager/service/group/InlongGroupService.java | 2 +-
.../service/group/InlongGroupServiceImpl.java | 4 +-
.../service/group/InlongNoneMqOperator.java | 4 +-
.../service/group/InlongPulsarOperator.java | 6 +-
.../manager/service/group/InlongTubeOperator.java | 4 +-
.../ConsumptionCompleteProcessListener.java | 26 +++----
.../listener/queue/QueueResourceListener.java | 3 +-
.../queue/StreamQueueResourceListener.java | 5 +-
.../listener/sink/SinkResourceListener.java | 6 +-
.../listener/sink/StreamSinkResourceListener.java | 6 +-
.../service/listener/sort/SortConfigListener.java | 6 +-
.../listener/sort/StreamSortConfigListener.java | 4 +-
.../source/AbstractSourceOperateListener.java | 15 ++--
.../resource/queue/QueueResourceOperator.java | 3 +-
.../queue/QueueResourceOperatorFactory.java | 3 +-
.../queue/pulsar/PulsarResourceOperator.java | 10 +--
.../queue/tubemq/TubeMQResourceOperator.java | 8 +--
.../resource/sink/SinkResourceOperator.java | 3 +-
.../resource/sink/SinkResourceOperatorFactory.java | 3 +-
.../sink/ck/ClickHouseResourceOperator.java | 6 +-
.../sink/es/ElasticsearchResourceOperator.java | 6 +-
.../resource/sink/hbase/HBaseResourceOperator.java | 6 +-
.../resource/sink/hive/HiveResourceOperator.java | 10 +--
.../sink/iceberg/IcebergResourceOperator.java | 6 +-
.../resource/sink/kafka/KafkaResourceOperator.java | 6 +-
.../resource/sink/mysql/MySQLResourceOperator.java | 6 +-
.../sink/oracle/OracleResourceOperator.java | 6 +-
.../sink/postgresql/PostgreSQLJdbcUtils.java | 4 +-
.../postgresql/PostgreSQLResourceOperator.java | 6 +-
.../manager/service/sink/SinkOperatorFactory.java | 3 +-
.../manager/service/sink/StreamSinkOperator.java | 5 +-
.../service/sink/StreamSinkServiceImpl.java | 20 ++----
.../service/sink/ck/ClickHouseSinkOperator.java | 6 +-
.../service/sink/es/ElasticsearchSinkOperator.java | 6 +-
.../sink/greenplum/GreenplumSinkOperator.java | 6 +-
.../service/sink/hbase/HBaseSinkOperator.java | 6 +-
.../service/sink/hdfs/HDFSSinkOperator.java | 6 +-
.../service/sink/hive/HiveSinkOperator.java | 8 +--
.../sink/iceberg/DLCIcebergSinkOperator.java | 6 +-
.../service/sink/iceberg/IcebergSinkOperator.java | 6 +-
.../service/sink/kafka/KafkaSinkOperator.java | 6 +-
.../service/sink/mysql/MySQLSinkOperator.java | 6 +-
.../service/sink/oracle/OracleSinkOperator.java | 6 +-
.../sink/postgresql/PostgreSQLSinkOperator.java | 8 +--
.../postgresql/TDSQLPostgreSQLSinkOperator.java | 6 +-
.../sink/sqlserver/SQLServerSinkOperator.java | 6 +-
.../service/source/SourceOperatorFactory.java | 3 +-
.../service/source/StreamSourceOperator.java | 5 +-
.../service/source/StreamSourceServiceImpl.java | 26 +++----
.../source/autopush/AutoPushSourceOperator.java | 12 ++--
.../source/binlog/BinlogSourceOperator.java | 12 ++--
.../service/source/file/FileSourceOperator.java | 12 ++--
.../service/source/kafka/KafkaSourceOperator.java | 12 ++--
.../source/mongodb/MongoDBSourceOperator.java | 8 +--
.../source/oracle/OracleSourceOperator.java | 8 +--
.../postgresql/PostgreSQLSourceOperator.java | 8 +--
.../source/pulsar/PulsarSourceOperator.java | 14 ++--
.../source/sqlserver/SQLServerSourceOperator.java | 8 +--
.../source/tubemq/TubeMQSourceOperator.java | 12 ++--
.../inlong/manager/service/ServiceBaseTest.java | 8 +--
.../service/cluster/InlongClusterServiceTest.java | 4 +-
.../service/core/impl/AgentServiceTest.java | 4 +-
.../service/core/impl/ConsumptionServiceTest.java | 6 +-
.../group/InlongGroupProcessServiceTest.java | 4 +-
.../service/group/InlongGroupServiceTest.java | 4 +-
.../service/sink/ClickHouseSinkServiceTest.java | 4 +-
.../service/sink/DLCIcebergSinkServiceTest.java | 4 +-
.../service/sink/ElasticsearchSinkServiceTest.java | 4 +-
.../service/sink/GreenplumSinkServiceTest.java | 4 +-
.../manager/service/sink/HBaseSinkServiceTest.java | 4 +-
.../service/sink/HDFSStreamSinkServiceTest.java | 4 +-
.../manager/service/sink/HiveSinkServiceTest.java | 4 +-
.../service/sink/IcebergSinkServiceTest.java | 4 +-
.../manager/service/sink/KafkaSinkServiceTest.java | 4 +-
.../manager/service/sink/MySQLSinkServiceTest.java | 4 +-
.../service/sink/MySQLStreamSinkServiceTest.java | 6 +-
.../service/sink/OracleSinkServiceTest.java | 4 +-
.../service/sink/PostgreSQLSinkServiceTest.java | 6 +-
.../service/sink/SQLServerSinkServiceTest.java | 4 +-
.../sink/TDSQLPostgreSQLSinkServiceTest.java | 6 +-
.../manager/service/sort/DisableZkForSortTest.java | 4 +-
.../service/source/MongoDBSourceServiceTest.java | 6 +-
.../service/source/OracleSourceServiceTest.java | 6 +-
.../service/source/SQLServerSourceServiceTest.java | 6 +-
.../service/source/StreamSourceServiceTest.java | 6 +-
.../service/source/TubeMQSourceServiceTest.java | 10 +--
.../source/listener/StreamSourceListenerTest.java | 4 +-
.../workflow/GroupTaskListenerFactoryTest.java | 8 +--
.../service/workflow/WorkflowServiceImplTest.java | 4 +-
.../main/resources/h2/apache_inlong_manager.sql | 2 +-
.../manager-web/sql/apache_inlong_manager.sql | 11 +--
183 files changed, 738 insertions(+), 986 deletions(-)
copy
inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/counter/Counter.java
=>
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/consts/DataNodeType.java
(68%)
copy
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/{enums/ClusterType.java
=> consts/MQType.java} (75%)
create mode 100644
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/consts/SinkType.java
create mode 100644
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/consts/SourceType.java
delete mode 100644
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/DataNodeType.java
delete mode 100644
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/MQType.java
delete mode 100644
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/SinkType.java
delete mode 100644
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/SourceType.java
delete mode 100644
inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/queue/tubemq/AddTubeMqTopicRequest.java
delete mode 100644
inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/queue/tubemq/QueryTubeTopicRequest.java
