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 76970200ec [Bugfix](light-schema-change) Fix bf columns message miss
when load (#11367)
76970200ec is described below
commit 76970200ec72544d0b156e043100bcbfcc1d7d51
Author: Lightman <[email protected]>
AuthorDate: Mon Aug 1 10:53:25 2022 +0800
[Bugfix](light-schema-change) Fix bf columns message miss when load (#11367)
---
fe/fe-core/src/main/java/org/apache/doris/catalog/Column.java | 8 +++++++-
.../src/main/java/org/apache/doris/planner/OlapScanNode.java | 2 +-
.../src/main/java/org/apache/doris/planner/OlapTableSink.java | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Column.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/Column.java
index 8e9bbe4ac9..b3cd503cc8 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Column.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Column.java
@@ -47,6 +47,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.Set;
/**
* This class represents the column-related metadata.
@@ -711,7 +712,8 @@ public class Column implements Writable {
return this.uniqueId;
}
- public void setIndexFlag(TColumn tColumn, List<Index> indexes) {
+ public void setIndexFlag(TColumn tColumn, OlapTable olapTable) {
+ List<Index> indexes = olapTable.getIndexes();
for (Index index : indexes) {
if (index.getIndexType() == IndexDef.IndexType.BITMAP) {
List<String> columns = index.getColumns();
@@ -720,5 +722,9 @@ public class Column implements Writable {
}
}
}
+ Set<String> bfColumns = olapTable.getCopiedBfColumns();
+ if (bfColumns != null && bfColumns.contains(tColumn.getColumnName())) {
+ tColumn.setIsBloomFilterColumn(true);
+ }
}
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java
b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java
index 787d8a771f..176b35fbb1 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java
@@ -792,7 +792,7 @@ public class OlapScanNode extends ScanNode {
if (selectedIndexId != -1) {
for (Column col : olapTable.getSchemaByIndexId(selectedIndexId,
true)) {
TColumn tColumn = col.toThrift();
- col.setIndexFlag(tColumn, olapTable.getIndexes());
+ col.setIndexFlag(tColumn, olapTable);
columnsDesc.add(tColumn);
if ((Util.showHiddenColumns() || (!Util.showHiddenColumns() &&
col.isVisible())) && col.isKey()) {
keyColumnNames.add(col.getName());
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 26a98105b9..642b33e0a6 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
@@ -192,7 +192,7 @@ public class OlapTableSink extends DataSink {
columns.addAll(indexMeta.getSchema().stream().map(Column::getName).collect(Collectors.toList()));
for (Column column : indexMeta.getSchema()) {
TColumn tColumn = column.toThrift();
- column.setIndexFlag(tColumn, table.getIndexes());
+ column.setIndexFlag(tColumn, table);
columnsDesc.add(tColumn);
}
TOlapTableIndexSchema indexSchema = new
TOlapTableIndexSchema(pair.getKey(), columns,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
