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 4d6d9a6c8c2 branch-2.1: [fix](persist) Fix
TableAddOrDropInvertedIndicesInfo.equals #45335 (#45364)
4d6d9a6c8c2 is described below
commit 4d6d9a6c8c2d4539eabb21cc1a6ced66b5b109df
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Dec 13 09:58:26 2024 +0800
branch-2.1: [fix](persist) Fix TableAddOrDropInvertedIndicesInfo.equals
#45335 (#45364)
Cherry-picked from #45335
Co-authored-by: walter <maoch...@selectdb.com>
---
fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java | 4 ----
.../org/apache/doris/persist/TableAddOrDropInvertedIndicesInfo.java | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java
b/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java
index ddb6557ab6b..ac78a8ea8b2 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/persist/EditLog.java
@@ -2025,15 +2025,11 @@ public class EditLog {
public void
logModifyTableAddOrDropInvertedIndices(TableAddOrDropInvertedIndicesInfo info) {
long logId =
logEdit(OperationType.OP_MODIFY_TABLE_ADD_OR_DROP_INVERTED_INDICES, info);
- LOG.info("walter log modify table add or drop inverted indices, infos:
{}, json: {}",
- info, info.toJson(), new RuntimeException("test"));
Env.getCurrentEnv().getBinlogManager().addModifyTableAddOrDropInvertedIndices(info,
logId);
}
public void logIndexChangeJob(IndexChangeJob indexChangeJob) {
long logId = logEdit(OperationType.OP_INVERTED_INDEX_JOB,
indexChangeJob);
- LOG.info("walter log inverted index job, infos: {}, json: {}",
- indexChangeJob, indexChangeJob.toJson(), new
RuntimeException("test"));
Env.getCurrentEnv().getBinlogManager().addIndexChangeJob(indexChangeJob, logId);
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/persist/TableAddOrDropInvertedIndicesInfo.java
b/fe/fe-core/src/main/java/org/apache/doris/persist/TableAddOrDropInvertedIndicesInfo.java
index 39a90046d24..effe33ce624 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/persist/TableAddOrDropInvertedIndicesInfo.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/persist/TableAddOrDropInvertedIndicesInfo.java
@@ -120,7 +120,7 @@ public class TableAddOrDropInvertedIndicesInfo implements
Writable {
TableAddOrDropInvertedIndicesInfo info =
(TableAddOrDropInvertedIndicesInfo) obj;
- return (dbId == info.dbId && tableId == tableId
+ return (dbId == info.dbId && tableId == info.tableId
&& indexSchemaMap.equals(info.indexSchemaMap)
&& indexes.equals(info.indexes)
&& alterInvertedIndexes.equals(info.alterInvertedIndexes)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
