This is an automated email from the ASF dual-hosted git repository.
w41ter pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new fb5002d723e [fix](binlog) Fix NPE when recover binlogs (#39909)
(#39910)
fb5002d723e is described below
commit fb5002d723e7d3859edc8705cdce570886ff0168
Author: walter <[email protected]>
AuthorDate: Mon Aug 26 20:17:26 2024 +0800
[fix](binlog) Fix NPE when recover binlogs (#39909) (#39910)
Cherry-pick #39909
The field partition ID of DropPartitionInfo was added in PR:
apache/doris#37196, the old version doesn't contain this field so it
will be null.
---
.../src/main/java/org/apache/doris/persist/DropPartitionInfo.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/persist/DropPartitionInfo.java
b/fe/fe-core/src/main/java/org/apache/doris/persist/DropPartitionInfo.java
index b5b56684f1b..0138549405e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/persist/DropPartitionInfo.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/persist/DropPartitionInfo.java
@@ -82,7 +82,9 @@ public class DropPartitionInfo implements Writable {
}
public Long getPartitionId() {
- return partitionId;
+ // the field partition ID was added in PR: apache/doris#37196, the old
version doesn't
+ // contain this field so it will be null.
+ return partitionId == null ? -1 : partitionId;
}
public String getPartitionName() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
