This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 9e45c709239 branch-2.1: [chore](restore) log the table name and
partition info when partition type is different #46213 (#46234)
9e45c709239 is described below
commit 9e45c709239a874352cfb11ea1a9e6470916bfe9
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Jan 1 08:09:11 2025 +0800
branch-2.1: [chore](restore) log the table name and partition info when
partition type is different #46213 (#46234)
Cherry-picked from #46213
Co-authored-by: walter <maoch...@selectdb.com>
---
fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
index 02c6f9f5276..df1ad45c3a9 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
@@ -1665,7 +1665,11 @@ public class OlapTable extends Table implements
MTMVRelatedTableIf {
// get intersect partition names with the given table "anotherTbl". not
including temp partitions
public Status getIntersectPartNamesWith(OlapTable anotherTbl, List<String>
intersectPartNames) {
if (this.getPartitionInfo().getType() !=
anotherTbl.getPartitionInfo().getType()) {
- return new Status(ErrCode.COMMON_ERROR, "Table's partition type is
different");
+ String msg = "Table's partition type is different. local table: "
+ getName()
+ + ", local type: " + getPartitionInfo().getType()
+ + ", another table: " + anotherTbl.getName()
+ + ", another type: " +
anotherTbl.getPartitionInfo().getType();
+ return new Status(ErrCode.COMMON_ERROR, msg);
}
Set<String> intersect = this.getPartitionNames();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
