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 2022/08/26 04:57:37 UTC
[inlong] branch release-1.3.0 updated (9fe9c54b1 -> d55e3d9cf)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a change to branch release-1.3.0
in repository https://gitbox.apache.org/repos/asf/inlong.git
discard 9fe9c54b1 [INLONG-5290][Manager] Optimize the objects returned by paging queries (#5558)
discard 1f97f2021 [INLONG-5691][Manager] Remove the append operation for agent IPs (#5692)
discard 34cbdfab0 [INLONG-5680][Manager][Sort] Fix field relation object generate error (#5693)
discard f63ebf9f3 [INLONG-5681][TubeMQ] The C++ SDK does not switch after the active Master node hangs up (#5682)
discard 323d4a31d [INLONG-5685][Dashboard] Fix the error of setting approvers params (#5686)
discard cd807f6db [INLONG-5678][Manager] Provide source info for group status (#5679)
discard 9e4d9296e [INLONG-5675][Agent] Support custom fixed ip for Agent (#5677)
discard 7e5400e19 [INLONG-5667][SDK] Change groupId and streamId while wrapping message (#5668)
discard f19f9eaa6 [INLONG-5657][Release] Change the tag of Docker images to 1.3.0 (#5661)
omit f1346a657 [INLONG-5663][Agent] To update data structure for k8s log (#5664)
omit 5c6f52ffd [INLONG-5652][Docker] Fix push aarch64 images script (#5653)
omit 9b8a0c335 [INLONG-5648][Dashboard] Optimize the create logic, support specifying specific types (#5649)
omit 13c193786 [INLONG-5658][DataProxy] Fix incorrect docker script (#5660)
omit 4e672def5 [INLONG-5655][Release] Change version from 1.3.0-SNAPSHOT to 1.3.0 (#5656)
omit 38dfe734f [INLONG-5650][Manager] Remove the non-null check of the Pulsar adminURL (#5651)
omit 98a136863 [INLONG-5637][Sort] Fix kafka load node npe error (#5638)
omit 05a94af45 [INLONG-5437][SDK] Support initializing SDK(cpp) by ClientConfig object (#5641)
add c9a640d4c [INLONG-5437][SDK] Support initializing SDK(cpp) by ClientConfig object (#5641)
add 90b678876 [INLONG-5637][Sort] Fix kafka load node npe error (#5638)
add 8f26932c8 [INLONG-5650][Manager] Remove the non-null check of the Pulsar adminURL (#5651)
add c1f798c96 [INLONG-5639][Release] Bumped version to 1.4.0-SNAPSHOT (#5640)
add 6171a2a7f [INLONG-5658][DataProxy] Fix incorrect docker script (#5660)
add 21de72e7a [INLONG-5648][Dashboard] Optimize the create logic, support specifying specific types (#5649)
add 2baf658c6 [INLONG-5652][Docker] Fix push aarch64 images script (#5653)
add f150ddbeb [INLONG-5663][Agent] To update data structure for k8s log (#5664)
add 14cff90e3 [INLONG-5621][SDK] Support multi-topic fetcher for Pulsar (#5625)
add 98bf0ee85 [INLONG-5667][SDK] Change groupId and streamId while wrapping message (#5668)
add 05286b7ee [INLONG-5672][TubeMQ] Add SetLogPrintLevel() in TubeMQServiceConfig class (#5673)
add c06627cab [INLONG-5675][Agent] Support custom fixed ip for Agent (#5677)
add db2ed5649 [INLONG-5678][Manager] Provide source info for group status (#5679)
add b4ba802e6 [INLONG-5685][Dashboard] Fix the error of setting approvers params (#5686)
add 1ff6dccda [INLONG-5681][TubeMQ] The C++ SDK does not switch after the active Master node hangs up (#5682)
add f8d7f8bba [INLONG-5623][SDK] Support multi-topic fetcher for Kafka (#5659)
add 9338dde13 [INLONG-5687][TubeMQ] Missing log content in the tests directory (#5688)
add 522267d2d [INLONG-5680][Manager][Sort] Fix field relation object generate error (#5693)
add 1b51ffd17 [INLONG-5691][Manager] Remove the append operation for agent IPs (#5692)
add 1f0ec44a6 [INLONG-5290][Manager] Optimize the objects returned by paging queries (#5558)
add 44976f1b8 [INLONG-5039][Manager] Support delete and update command, and query execution logs for manager client (#5519)
add 388c92202 [INLONG-5696][Dashboard] EditableTable value update error when columns change (#5697)
add fea2d2140 [INLONG-5698][Manager] Fixed the DataProxy cluster tag was restored after the manager was restarted (#5699)
add 9efb1124a [INLONG-5689][Manager] PulsarSource set fieldDelimiter when use CSV format (#5690)
add defa542b6 [INLONG-5705][Manager] Fix the deprecated dependency of PageInfo (#5704)
add a133995d1 [INLONG-5694][Manager] Fix the problem that gets the inlong group error (#5695)
add 09d0f30cb [INLONG-5703][Manager] Add separator-related fields for some sources (#5706)
add d55e3d9cf [INLONG-5700][TubeMQ] Core file generated while the C++ consumer is closed (#5707)
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (9fe9c54b1)
\
N -- N -- N refs/heads/release-1.3.0 (d55e3d9cf)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
conf/inlong.conf | 2 +-
docker/docker-compose/docker-compose.yml | 10 +-
inlong-agent/agent-common/pom.xml | 2 +-
inlong-agent/agent-core/pom.xml | 2 +-
inlong-agent/agent-docker/README.md | 2 +-
inlong-agent/agent-docker/pom.xml | 2 +-
inlong-agent/agent-plugins/pom.xml | 2 +-
inlong-agent/agent-release/pom.xml | 2 +-
inlong-agent/pom.xml | 2 +-
inlong-audit/audit-common/pom.xml | 2 +-
inlong-audit/audit-docker/README.md | 2 +-
inlong-audit/audit-docker/pom.xml | 2 +-
inlong-audit/audit-proxy/pom.xml | 2 +-
inlong-audit/audit-release/pom.xml | 2 +-
inlong-audit/audit-sdk/pom.xml | 2 +-
inlong-audit/audit-store/pom.xml | 2 +-
inlong-audit/pom.xml | 2 +-
inlong-common/pom.xml | 2 +-
inlong-dashboard/pom.xml | 2 +-
.../src/components/EditableTable/index.tsx | 10 +-
inlong-dataproxy/dataproxy-dist/pom.xml | 2 +-
inlong-dataproxy/dataproxy-docker/README.md | 2 +-
inlong-dataproxy/dataproxy-docker/pom.xml | 2 +-
inlong-dataproxy/dataproxy-source/pom.xml | 2 +-
inlong-dataproxy/pom.xml | 2 +-
inlong-distribution/pom.xml | 2 +-
inlong-manager/manager-client-examples/pom.xml | 2 +-
inlong-manager/manager-client-tools/pom.xml | 2 +-
.../inlong/manager/client/cli/CommandToolMain.java | 5 +-
.../inlong/manager/client/cli/CreateCommand.java | 23 +-
.../inlong/manager/client/cli/DeleteCommand.java | 66 ++++
.../inlong/manager/client/cli/ListCommand.java | 2 +-
.../inlong/manager/client/cli/LogCommand.java | 87 +++++
.../cli/{CreateCommand.java => UpdateCommand.java} | 56 ++-
.../inlong/manager/client/cli/pojo/GroupInfo.java | 2 +
.../inlong/manager/client/cli/pojo/SinkInfo.java | 2 +
.../inlong/manager/client/cli/pojo/SourceInfo.java | 2 +
.../inlong/manager/client/cli/pojo/StreamInfo.java | 2 +
.../manager/client/cli/util/ClientUtils.java | 5 +-
.../inlong/manager/client/cli/TestCommand.java | 25 +-
.../src/test/resources/create_group.json | 29 +-
.../src/test/resources/test_config.json | 9 +
inlong-manager/manager-client/pom.xml | 2 +-
inlong-manager/manager-common/pom.xml | 2 +-
inlong-manager/manager-dao/pom.xml | 2 +-
.../dao/mapper/InlongClusterEntityMapper.java | 2 +
.../mappers/InlongClusterEntityMapper.xml | 15 +
inlong-manager/manager-docker/README.md | 2 +-
inlong-manager/manager-docker/pom.xml | 2 +-
inlong-manager/manager-plugins/pom.xml | 2 +-
.../plugin/listener/DeleteSortListener.java | 12 +-
.../plugin/listener/DeleteStreamListener.java | 12 +-
.../plugin/listener/RestartSortListener.java | 14 +-
.../plugin/listener/RestartStreamListener.java | 14 +-
.../plugin/listener/StartupStreamListener.java | 14 +-
.../plugin/listener/SuspendSortListener.java | 12 +-
.../plugin/listener/SuspendStreamListener.java | 12 +-
inlong-manager/manager-pojo/pom.xml | 2 +-
.../manager/pojo/sort/util/ExtractNodeUtils.java | 5 +-
.../pojo/source/autopush/AutoPushSource.java | 9 +
.../pojo/source/autopush/AutoPushSourceDTO.java | 9 +
.../source/autopush/AutoPushSourceRequest.java | 11 +
.../manager/pojo/source/kafka/KafkaSource.java | 9 +
.../manager/pojo/source/kafka/KafkaSourceDTO.java | 9 +
.../pojo/source/kafka/KafkaSourceRequest.java | 11 +
.../manager/pojo/source/pulsar/PulsarSource.java | 9 +
.../pojo/source/pulsar/PulsarSourceDTO.java | 9 +
.../pojo/source/pulsar/PulsarSourceRequest.java | 11 +
inlong-manager/manager-service/pom.xml | 2 +-
.../service/core/heartbeat/HeartbeatManager.java | 11 +-
.../service/core/impl/ConsumptionServiceImpl.java | 8 +-
.../service/core/impl/SortSourceServiceImpl.java | 17 +-
.../service/group/InlongGroupServiceImpl.java | 5 +-
.../source/pulsar/PulsarSourceOperator.java | 7 +
inlong-manager/manager-test/pom.xml | 2 +-
inlong-manager/manager-web/pom.xml | 2 +-
inlong-manager/manager-workflow/pom.xml | 2 +-
.../core/impl/WorkflowQueryServiceImpl.java | 5 +-
inlong-manager/pom.xml | 2 +-
inlong-sdk/dataproxy-sdk/pom.xml | 2 +-
inlong-sdk/pom.xml | 2 +-
inlong-sdk/sdk-common/pom.xml | 2 +-
inlong-sdk/sort-sdk/pom.xml | 4 +-
.../inlong/sdk/sort/api/MultiTopicsFetcher.java | 85 +++++
.../inlong/sdk/sort/api/SortClientConfig.java | 11 +
.../sort/fetcher/kafka/AckOffsetOnRebalance.java | 36 ++
...icFetcher.java => KafkaMultiTopicsFetcher.java} | 273 +++++++++-----
.../sdk/sort/fetcher/pulsar/PulsarConsumer.java | 96 +++++
.../fetcher/pulsar/PulsarMultiTopicsFetcher.java | 418 +++++++++++++++++++++
inlong-sort-standalone/pom.xml | 2 +-
.../sort-standalone-common/pom.xml | 2 +-
.../sort-standalone-dist/pom.xml | 2 +-
.../sort-standalone-source/pom.xml | 2 +-
inlong-sort/pom.xml | 2 +-
inlong-sort/sort-api/pom.xml | 2 +-
inlong-sort/sort-common/pom.xml | 2 +-
.../sort/protocol/node/format/CsvFormat.java | 5 +
inlong-sort/sort-connectors/base/pom.xml | 2 +-
inlong-sort/sort-connectors/doris/pom.xml | 2 +-
.../sort-connectors/elasticsearch-6/pom.xml | 2 +-
.../sort-connectors/elasticsearch-7/pom.xml | 2 +-
.../sort-connectors/elasticsearch-base/pom.xml | 2 +-
inlong-sort/sort-connectors/filesystem/pom.xml | 2 +-
inlong-sort/sort-connectors/hbase/pom.xml | 2 +-
inlong-sort/sort-connectors/hive/pom.xml | 2 +-
inlong-sort/sort-connectors/iceberg-dlc/pom.xml | 2 +-
inlong-sort/sort-connectors/iceberg/pom.xml | 2 +-
inlong-sort/sort-connectors/jdbc/pom.xml | 2 +-
inlong-sort/sort-connectors/kafka/pom.xml | 2 +-
inlong-sort/sort-connectors/mongodb-cdc/pom.xml | 2 +-
inlong-sort/sort-connectors/mysql-cdc/pom.xml | 2 +-
inlong-sort/sort-connectors/oracle-cdc/pom.xml | 2 +-
inlong-sort/sort-connectors/pom.xml | 2 +-
inlong-sort/sort-connectors/postgres-cdc/pom.xml | 2 +-
inlong-sort/sort-connectors/pulsar/pom.xml | 2 +-
inlong-sort/sort-connectors/redis/pom.xml | 2 +-
inlong-sort/sort-connectors/sqlserver-cdc/pom.xml | 2 +-
inlong-sort/sort-connectors/tubemq/pom.xml | 2 +-
inlong-sort/sort-core/pom.xml | 2 +-
inlong-sort/sort-dist/pom.xml | 2 +-
inlong-sort/sort-end-to-end-tests/pom.xml | 2 +-
inlong-sort/sort-formats/format-base/pom.xml | 2 +-
inlong-sort/sort-formats/format-common/pom.xml | 2 +-
inlong-sort/sort-formats/format-csv/pom.xml | 2 +-
.../sort-formats/format-inlongmsg-base/pom.xml | 2 +-
.../sort-formats/format-inlongmsg-csv/pom.xml | 2 +-
.../sort-formats/format-inlongmsg-pb/pom.xml | 2 +-
inlong-sort/sort-formats/format-json/pom.xml | 2 +-
inlong-sort/sort-formats/format-kv/pom.xml | 2 +-
inlong-sort/sort-formats/pom.xml | 2 +-
inlong-tubemq/pom.xml | 2 +-
.../example/consumer/test_consumer.cc | 1 +
.../include/tubemq/tubemq_config.h | 1 +
.../tubemq-client-cpp/src/baseconsumer.cc | 40 +-
.../tubemq-client-cpp/src/tubemq_config.cc | 5 +-
.../tubemq-client-cpp/tests/CMakeLists.txt | 2 +-
.../{thread_pool => logger_test}/CMakeLists.txt | 2 +-
.../tests/{thread_pool => logger_test}/main.cc | 32 +-
inlong-tubemq/tubemq-client/pom.xml | 2 +-
inlong-tubemq/tubemq-connectors/pom.xml | 2 +-
.../tubemq-connector-flink/pom.xml | 2 +-
.../tubemq-connector-flume/pom.xml | 2 +-
.../tubemq-connector-spark/pom.xml | 2 +-
inlong-tubemq/tubemq-core/pom.xml | 2 +-
inlong-tubemq/tubemq-docker/pom.xml | 2 +-
inlong-tubemq/tubemq-docker/tubemq-all/README.md | 2 +-
inlong-tubemq/tubemq-docker/tubemq-all/pom.xml | 2 +-
inlong-tubemq/tubemq-docker/tubemq-build/pom.xml | 2 +-
inlong-tubemq/tubemq-docker/tubemq-cpp/pom.xml | 2 +-
inlong-tubemq/tubemq-docker/tubemq-manager/pom.xml | 2 +-
inlong-tubemq/tubemq-example/pom.xml | 2 +-
inlong-tubemq/tubemq-manager/pom.xml | 2 +-
inlong-tubemq/tubemq-server/pom.xml | 2 +-
pom.xml | 2 +-
154 files changed, 1438 insertions(+), 356 deletions(-)
create mode 100644 inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/DeleteCommand.java
create mode 100644 inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/LogCommand.java
copy inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/{CreateCommand.java => UpdateCommand.java} (50%)
create mode 100644 inlong-manager/manager-client-tools/src/test/resources/test_config.json
create mode 100644 inlong-sdk/sort-sdk/src/main/java/org/apache/inlong/sdk/sort/api/MultiTopicsFetcher.java
copy inlong-sdk/sort-sdk/src/main/java/org/apache/inlong/sdk/sort/fetcher/kafka/{KafkaSingleTopicFetcher.java => KafkaMultiTopicsFetcher.java} (57%)
create mode 100644 inlong-sdk/sort-sdk/src/main/java/org/apache/inlong/sdk/sort/fetcher/pulsar/PulsarConsumer.java
create mode 100644 inlong-sdk/sort-sdk/src/main/java/org/apache/inlong/sdk/sort/fetcher/pulsar/PulsarMultiTopicsFetcher.java
copy inlong-tubemq/tubemq-client-twins/tubemq-client-cpp/tests/{thread_pool => logger_test}/CMakeLists.txt (95%)
copy inlong-tubemq/tubemq-client-twins/tubemq-client-cpp/tests/{thread_pool => logger_test}/main.cc (58%)