This is an automated email from the ASF dual-hosted git repository.
vernedeng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 05046e2215 [INLONG-11770][Sort][SDK] Fix potential Null Pointer
Exception (#11771)
05046e2215 is described below
commit 05046e2215235511bd425fb1eec5d326a3f42aba
Author: vernedeng <verned...@apache.org>
AuthorDate: Thu Feb 27 10:59:17 2025 +0800
[INLONG-11770][Sort][SDK] Fix potential Null Pointer Exception (#11771)
* [INLONG-11770][Sort][SDK] Fix potential Null Pointer Exception
* fix ut
---
.../dataproxy-sdk-twins/dataproxy-sdk-cpp/src/group/send_group.cc | 2 +-
.../org/apache/inlong/sdk/transform/decode/ParquetSourceData.java | 2 +-
.../elasticsearch/table/MultipleElasticsearchSinkFunctionBase.java | 6 +++++-
pom.xml | 6 +++---
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git
a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-cpp/src/group/send_group.cc
b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-cpp/src/group/send_group.cc
index 0bbedcd0fb..e9ef9f889e 100644
--- a/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-cpp/src/group/send_group.cc
+++ b/inlong-sdk/dataproxy-sdk-twins/dataproxy-sdk-cpp/src/group/send_group.cc
@@ -72,7 +72,7 @@ SendGroup::~SendGroup() {
update_conf_timer_->cancel();
}
if (load_balance_timer_) {
- update_conf_timer_->cancel();
+ load_balance_timer_->cancel();
}
io_context_.stop();
diff --git
a/inlong-sdk/transform-sdk/src/main/java/org/apache/inlong/sdk/transform/decode/ParquetSourceData.java
b/inlong-sdk/transform-sdk/src/main/java/org/apache/inlong/sdk/transform/decode/ParquetSourceData.java
index 02eff5167f..ab294d867b 100644
---
a/inlong-sdk/transform-sdk/src/main/java/org/apache/inlong/sdk/transform/decode/ParquetSourceData.java
+++
b/inlong-sdk/transform-sdk/src/main/java/org/apache/inlong/sdk/transform/decode/ParquetSourceData.java
@@ -81,8 +81,8 @@ public class ParquetSourceData implements SourceData {
} else if (StringUtils.startsWith(fieldName, CHILD_KEY)) {
// To meet various situations
if (childType instanceof GroupType) {
- Group group = childParent.getGroup(childName, rowNum);
if (childParent != null && rowNum < getRowCount()) {
+ Group group = childParent.getGroup(childName, rowNum);
// Dealing with multi-level paths
fieldName = fieldName.substring(CHILD_KEY.length());
fieldValue = parseFields(fieldName, group);
diff --git
a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/elasticsearch-base/src/main/java/org/apache/inlong/sort/elasticsearch/table/MultipleElasticsearchSinkFunctionBase.java
b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/elasticsearch-base/src/main/java/org/apache/inlong/sort/elasticsearch/table/MultipleElasticsearchSinkFunctionBase.java
index b7ab0ab31b..0440e3c4ad 100644
---
a/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/elasticsearch-base/src/main/java/org/apache/inlong/sort/elasticsearch/table/MultipleElasticsearchSinkFunctionBase.java
+++
b/inlong-sort/sort-flink/sort-flink-v1.13/sort-connectors/elasticsearch-base/src/main/java/org/apache/inlong/sort/elasticsearch/table/MultipleElasticsearchSinkFunctionBase.java
@@ -207,7 +207,11 @@ public abstract class
MultipleElasticsearchSinkFunctionBase<Request, ContentType
// dirty data & archive
if (SchemaUpdateExceptionPolicy.LOG_WITH_IGNORE ==
schemaUpdateExceptionPolicy) {
dirtySinkHelper.invoke(rowData, dirtyType, e);
- if (sinkMetricData != null && index != null) {
+ if (sinkMetricData == null) {
+ return;
+ }
+
+ if (index != null) {
sinkMetricData.outputDirtyMetrics(index, 1,
rowData.toString().getBytes(StandardCharsets.UTF_8).length);
} else {
diff --git a/pom.xml b/pom.xml
index 01a88cf4d7..50b53cce49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,7 @@
<docker.organization>inlong</docker.organization>
<embedded.redis.version>0.7.3</embedded.redis.version>
- <netty.version>4.1.94.Final</netty.version>
+ <netty.version>4.1.118.Final</netty.version>
<jboss.netty.version>3.10.6.Final</jboss.netty.version>
<scala.binary.version>2.12</scala.binary.version>
<spark.version>2.4.4</spark.version>
@@ -102,7 +102,7 @@
<hadoop.version>2.10.2</hadoop.version>
<postgresql.version>42.4.5</postgresql.version>
<oracle.jdbc.version>19.3.0.0</oracle.jdbc.version>
- <mysql.jdbc.version>8.0.28</mysql.jdbc.version>
+ <mysql.jdbc.version>8.0.33</mysql.jdbc.version>
<mssql.jdbc.version>12.4.1.jre8</mssql.jdbc.version>
<sqlserver.jdbc.version>7.2.2.jre8</sqlserver.jdbc.version>
<mybatis.starter.version>2.1.3</mybatis.starter.version>
@@ -207,7 +207,7 @@
<libfb303.version>0.9.3</libfb303.version>
<apache.thrift.version>0.14.1</apache.thrift.version>
<aircompressor.version>0.27</aircompressor.version>
- <json.smart.version>2.5.1</json.smart.version>
+ <json.smart.version>2.5.2</json.smart.version>
</properties>
<dependencyManagement>
