database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix bug: compare column with equals rather than == (#1850)

Browse Source
This commit is contained in:
xionglei0
2019-09-24 09:40:11 +08:00
committed by ZHAO Chun
parent c3fccb7a49
commit b756dfd90b
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
fe/src/main/java/org/apache/doris/analysis/Analyzer.java
View File

@ -1032,19 +1032,6 @@ public class Analyzer {
return false;
}
/**
* Return slot descriptor corresponding to column referenced in the context
* of tupleDesc, or null if no such reference exists.
*/
public SlotDescriptor getColumnSlot(TupleDescriptor tupleDesc, Column col) {
for (SlotDescriptor slotDesc : tupleDesc.getSlots()) {
if (slotDesc.getColumn() == col) {
return slotDesc;
}
}
return null;
}
public DescriptorTable getDescTbl() {
return globalState.descTbl;
}

13
fe/src/main/java/org/apache/doris/analysis/TupleDescriptor.java
View File

@ -102,6 +102,19 @@ public class TupleDescriptor {
return result;
}
/**
* Return slot descriptor corresponding to column referenced in the context
* of tupleDesc, or null if no such reference exists.
*/
public SlotDescriptor getColumnSlot(String columnName) {
for (SlotDescriptor slotDesc : slots) {
if (slotDesc.getColumn() != null && slotDesc.getColumn().getName().equalsIgnoreCase(columnName)) {
return slotDesc;
}
}
return null;
}
public Table getTable() {
return table;
}

2
fe/src/main/java/org/apache/doris/planner/SingleNodePlanner.java
View File

@ -1261,7 +1261,7 @@ public class SingleNodePlanner {
Map<String, PartitionColumnFilter> columnFilters = Maps.newHashMap();
List<Expr> conjuncts = analyzer.getUnassignedConjuncts(scanNode);
for (Column column : tblRef.getTable().getBaseSchema()) {
SlotDescriptor slotDesc = analyzer.getColumnSlot(tblRef.getDesc(), column);
SlotDescriptor slotDesc = tblRef.getDesc().getColumnSlot(column.getName());
if (null == slotDesc) {
continue;
}