[incubator-inlong] branch master updated (7f8d471 -> a46ac5a)

[do...@apache.org]

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 7f8d471  [INLONG-2524][Feature][Sort] Support deserialization of json, canal and avro formatted data (#2525)
     add a46ac5a  [INLONG-2483] Manager provide metadata interface to Dataproxy, and Dataproxy dynamically get metadata and MQ config from Manager. (#2493)

No new revisions were added by this update.

Summary of changes:
 inlong-common/pom.xml                              |   6 +
 .../commons/pojo/dataproxy}/DataProxyConfig.java   |   3 +-
 .../commons/pojo/dataproxy/ProxyPulsarDTO.java     |  26 ++--
 .../commons/pojo/dataproxy/PulsarClusterInfo.java  |  35 ++---
 inlong-dashboard/package-lock.json                 |  12 +-
 .../conf/flume-mulit-pulsar-http-example.conf      |  50 +------
 .../conf/flume-mulit-pulsar-tcp-example.conf       |  49 -------
 .../conf/flume-mulit-pulsar-udp-example.conf       |  49 -------
 .../inlong/dataproxy/config/ConfigManager.java     |  79 +++++++++--
 .../inlong/dataproxy/config/RemoteConfigJson.java  |  32 ++---
 .../config/holder/MxPropertiesHolder.java          |   6 +-
 ...opertiesHolder.java => PulsarConfigHolder.java} |  32 +++--
 .../inlong/dataproxy/config/pojo/PulsarConfig.java | 148 ++++++++++++++++++++
 .../apache/inlong/dataproxy/sink/PulsarSink.java   | 149 ++++++++++----------
 .../dataproxy/sink/pulsar/PulsarClientService.java | 152 +++++++++------------
 .../dataproxy-source/src/main/resources/flume.conf |   6 -
 .../config/loader/TestPulsarConfigLoader.java      |  25 ++--
 .../inlong/dataproxy/sink/TestPulsarSink.java      |  42 ++++--
 .../src/test/resources/pulsar_config.properties    |  13 +-
 .../src/test/resources/topics.properties           |  10 +-
 inlong-dataproxy/pom.xml                           |   6 +
 .../common/pojo/cluster/ClusterRequest.java        |   3 +
 .../inlong/manager/dao/entity/BusinessEntity.java  |   4 +-
 .../manager/dao/entity/ClusterInfoEntity.java      |   5 +-
 .../manager/dao/entity/DataProxyClusterEntity.java |   4 +-
 .../manager/dao/mapper/BusinessEntityMapper.java   |  11 +-
 .../manager/dao/mapper/ClusterInfoMapper.java      |   3 +-
 .../dao/mapper/DataProxyClusterEntityMapper.java   |   5 +-
 .../resources/mappers/BusinessEntityMapper.xml     |  19 ++-
 .../main/resources/mappers/ClusterInfoMapper.xml   |  22 ++-
 .../mappers/DataProxyClusterEntityMapper.xml       |  37 +++--
 .../service/core/DataProxyClusterService.java      |  13 +-
 .../core/impl/DataProxyClusterServiceImpl.java     |  69 +++++++++-
 .../manager-web/sql/apache_inlong_manager.sql      |   9 +-
 .../controller/openapi/DataProxyController.java    |  18 ++-
 35 files changed, 672 insertions(+), 480 deletions(-)
 rename {inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity => inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy}/DataProxyConfig.java (95%)
 copy inlong-sort/sort-single-tenant/src/main/java/org/apache/inlong/sort/singletenant/flink/deserialization/ListCollector.java => inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/ProxyPulsarDTO.java (60%)
 copy inlong-sdk/sort-sdk/src/main/java/org/apache/inlong/sdk/sort/entity/HeartBeatParams.java => inlong-common/src/main/java/org/apache/inlong/commons/pojo/dataproxy/PulsarClusterInfo.java (63%)
 copy inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/holder/{MxPropertiesHolder.java => PulsarConfigHolder.java} (61%)
 create mode 100644 inlong-dataproxy/dataproxy-source/src/main/java/org/apache/inlong/dataproxy/config/pojo/PulsarConfig.java
 copy inlong-manager/manager-service/src/test/java/org/apache/inlong/manager/service/core/plugin/JarHellTest.java => inlong-dataproxy/dataproxy-source/src/test/java/org/apache/inlong/dataproxy/config/loader/TestPulsarConfigLoader.java (62%)
 copy inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory => inlong-dataproxy/dataproxy-source/src/test/resources/pulsar_config.properties (67%)
 copy inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory => inlong-dataproxy/dataproxy-source/src/test/resources/topics.properties (70%)