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/23 11:26:49 UTC

[inlong] branch release-1.3.0 updated (05a94af45 -> 38dfe734f)

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


    from 05a94af45 [INLONG-5437][SDK] Support initializing SDK(cpp) by ClientConfig object (#5641)
     new 98a136863 [INLONG-5637][Sort] Fix kafka load node npe error (#5638)
     new 38dfe734f [INLONG-5650][Manager] Remove the non-null check of the Pulsar adminURL (#5651)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../inlong/manager/pojo/cluster/pulsar/PulsarClusterRequest.java  | 3 ---
 .../java/org/apache/inlong/sort/kafka/FlinkKafkaProducer.java     | 8 ++------
 2 files changed, 2 insertions(+), 9 deletions(-)


[inlong] 01/02: [INLONG-5637][Sort] Fix kafka load node npe error (#5638)

Posted by do...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

dockerzhang pushed a commit to branch release-1.3.0
in repository https://gitbox.apache.org/repos/asf/inlong.git

commit 98a13686348cb2971fdcafccf0e5d0c5e962a96a
Author: Charles <44...@users.noreply.github.com>
AuthorDate: Tue Aug 23 17:36:29 2022 +0800

    [INLONG-5637][Sort] Fix kafka load node npe error (#5638)
    
    * [INLONG-5637][Sort] Fix kafka load node npe error
    
    * [INLONG-5637][Sort] Fix kafka load node npe error
---
 .../java/org/apache/inlong/sort/kafka/FlinkKafkaProducer.java     | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/inlong-sort/sort-connectors/kafka/src/main/java/org/apache/inlong/sort/kafka/FlinkKafkaProducer.java b/inlong-sort/sort-connectors/kafka/src/main/java/org/apache/inlong/sort/kafka/FlinkKafkaProducer.java
index 93e7a8b31..75b965340 100644
--- a/inlong-sort/sort-connectors/kafka/src/main/java/org/apache/inlong/sort/kafka/FlinkKafkaProducer.java
+++ b/inlong-sort/sort-connectors/kafka/src/main/java/org/apache/inlong/sort/kafka/FlinkKafkaProducer.java
@@ -928,19 +928,15 @@ public class FlinkKafkaProducer<IN>
     }
 
     private void sendOutMetrics(Long rowSize, Long dataSize) {
-        if (metricData.getNumRecordsOut() != null) {
+        if (metricData != null) {
             metricData.getNumRecordsOut().inc(rowSize);
-        }
-        if (metricData.getNumBytesOut() != null) {
             metricData.getNumBytesOut().inc(dataSize);
         }
     }
 
     private void sendDirtyMetrics(Long rowSize, Long dataSize) {
-        if (metricData.getDirtyRecords() != null) {
+        if (metricData != null) {
             metricData.getDirtyRecords().inc(rowSize);
-        }
-        if (metricData.getDirtyBytes() != null) {
             metricData.getDirtyBytes().inc(dataSize);
         }
     }


[inlong] 02/02: [INLONG-5650][Manager] Remove the non-null check of the Pulsar adminURL (#5651)

Posted by do...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

dockerzhang pushed a commit to branch release-1.3.0
in repository https://gitbox.apache.org/repos/asf/inlong.git

commit 38dfe734f45c76574d3fc1fb83acb4b0aa1d35cf
Author: healchow <he...@gmail.com>
AuthorDate: Tue Aug 23 17:46:13 2022 +0800

    [INLONG-5650][Manager] Remove the non-null check of the Pulsar adminURL (#5651)
---
 .../inlong/manager/pojo/cluster/pulsar/PulsarClusterRequest.java       | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/pulsar/PulsarClusterRequest.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/pulsar/PulsarClusterRequest.java
index 71369c8b7..d574efde4 100644
--- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/pulsar/PulsarClusterRequest.java
+++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/pulsar/PulsarClusterRequest.java
@@ -26,8 +26,6 @@ import org.apache.inlong.manager.common.enums.ClusterType;
 import org.apache.inlong.manager.common.util.JsonTypeDefine;
 import org.apache.inlong.manager.pojo.cluster.ClusterRequest;
 
-import javax.validation.constraints.NotBlank;
-
 /**
  * Inlong cluster request for Pulsar
  */
@@ -38,7 +36,6 @@ import javax.validation.constraints.NotBlank;
 @ApiModel("Inlong cluster request for Pulsar")
 public class PulsarClusterRequest extends ClusterRequest {
 
-    @NotBlank(message = "adminUrl cannot be blank")
     @ApiModelProperty(value = "Pulsar admin URL, such as: http://127.0.0.1:8080",
             notes = "Pulsar service URL is the 'url' field of the cluster")
     private String adminUrl;