You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2023/06/19 01:11:42 UTC
[doris] branch master updated: [bugfix](inverted index) fix not writing inverted index file if upgrade from old version #20945
This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 0bed52d86b [bugfix](inverted index) fix not writing inverted index file if upgrade from old version #20945
0bed52d86b is described below
commit 0bed52d86b68c910aa6ee494a3b606817c4cbb64
Author: Kang <kx...@gmail.com>
AuthorDate: Mon Jun 19 09:11:36 2023 +0800
[bugfix](inverted index) fix not writing inverted index file if upgrade from old version #20945
The metadata indexes in MaterializedIndexMeta is introduced in 2.0-beta version and it's relied by writing inverted index. When upgrade doris from old version to 2.0-beta, the metadata indexes in MaterializedIndexMeta is empty and no inverted index file will be written.
This PR add compatibility logic to use metadata indexes in table if indexes in MaterializedIndexMeta is empty and indexes in MaterializedIndexMeta indexId is equal to table baseIndexId.
This PR also fix metadata indexes missing for schema change.
---
.../src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java | 3 ++-
.../src/main/java/org/apache/doris/planner/OlapTableSink.java | 8 +++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java b/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java
index 0fdf711d10..191629860e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java
@@ -365,7 +365,8 @@ public class SchemaChangeJobV2 extends AlterJobV2 {
indexSchemaVersionAndHashMap.get(shadowIdxId).schemaVersion,
indexSchemaVersionAndHashMap.get(shadowIdxId).schemaHash,
indexShortKeyMap.get(shadowIdxId), TStorageType.COLUMN,
- tbl.getKeysTypeByIndexId(indexIdMap.get(shadowIdxId)), null);
+ tbl.getKeysTypeByIndexId(indexIdMap.get(shadowIdxId)),
+ indexChange ? indexes : tbl.getIndexMetaByIndexId(indexIdMap.get(shadowIdxId)).getIndexes());
}
tbl.rebuildFullSchema();
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapTableSink.java b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapTableSink.java
index 5666c0e734..ea6f92616c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapTableSink.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapTableSink.java
@@ -228,7 +228,13 @@ public class OlapTableSink extends DataSink {
column.setIndexFlag(tColumn, table);
columnsDesc.add(tColumn);
}
- for (Index index : indexMeta.getIndexes()) {
+ List<Index> indexes = indexMeta.getIndexes();
+ if (indexes.size() == 0 && pair.getKey() == table.getBaseIndexId()) {
+ // for compatible with old version befor 2.0-beta
+ // if indexMeta.getIndexes() is empty, use table.getIndexes()
+ indexes = table.getIndexes();
+ }
+ for (Index index : indexes) {
TOlapTableIndex tIndex = index.toThrift();
indexDesc.add(tIndex);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org