mirror/dble
1
0
Fork 0
mirror of https://github.com/actiontech/dble.git synced 2026-04-24 15:18:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

[inner-1812&1811&1810] fix : when natural join, fix 'could not find the column' and 'duplicate column' and adjust columns order (#3365)

Browse Source 
* [inner-1812] fix: when natural join could not find the column

* [inner-1811] fix: when natural join, duplicate column

* [inner-1810] adjust columns order of natual join

Co-authored-by: ylinzhu <46126022+ylinzhu@users.noreply.github.com>
This commit is contained in:
wenyh
2022-08-23 17:06:24 +08:00
committed by GitHub
parent bc1f401202
commit 98df96ad8d
4 changed files with 129 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/actiontech/dble/plan/NamedField.java
+15 -1
View File
@@ -17,8 +17,9 @@ public class NamedField {
// which node of the field belong
public final PlanNode planNode;
private int charsetIndex;
private boolean isNatualShow = true; // when natual join ,use it
public NamedField(String inputSchema, String inputTable, String name, PlanNode planNode) {
public NamedField(String inputSchema, String inputTable, String name, PlanNode planNode, boolean isNatualShow) {
String tempTableSchmea;
String tempTableName;
if (DbleServer.getInstance().getSystemVariables().isLowerCaseTableNames()) {
@@ -38,6 +39,11 @@ public class NamedField {
int hash = tempTableSchmea == null ? 0 : tempTableSchmea.hashCode();
hash = hash * prime + (tempTableName == null ? 0 : tempTableName.hashCode());
this.hashCode = hash * prime + (name == null ? 0 : name.toLowerCase().hashCode());
this.isNatualShow = isNatualShow;
}
public NamedField(String inputSchema, String inputTable, String name, PlanNode planNode) {
this(inputSchema, inputTable, name, planNode, true);
}
@Override
@@ -58,6 +64,14 @@ public class NamedField {
return name;
}
public boolean isNatualShow() {
return isNatualShow;
}
public void noShow() {
isNatualShow = false;
}
public int getCharsetIndex() {
return charsetIndex;
}
src/main/java/com/actiontech/dble/plan/common/item/ItemField.java
+10
View File
@@ -35,6 +35,8 @@ public class ItemField extends ItemIdent {
/* if index!=-1, means the index of Item_field,need setField before val */
private int index = -1;
private boolean isNatualShow = true; // when natual join ,use it
public ItemField(String dbName, String tableName, String fieldName, int charsetIndex) {
super(dbName, tableName, fieldName);
this.charsetIndex = charsetIndex;
@@ -361,4 +363,12 @@ public class ItemField extends ItemIdent {
public Field getField() {
return field;
}
public void noNatualShow() {
isNatualShow = false;
}
public boolean isNatualShow() {
return isNatualShow;
}
}
src/main/java/com/actiontech/dble/plan/node/JoinNode.java
+101 -50
View File
@@ -53,6 +53,7 @@ public class JoinNode extends PlanNode {
private List<String> usingFields;
private boolean isNatural = false;
private boolean isExistNatural = false;
/**
* <pre>
* leftOuterJoin:
@@ -177,7 +178,7 @@ public class JoinNode extends PlanNode {
for (NamedField field : node.getOuterFields().keySet()) {
String fieldName = field.getName().toLowerCase();
if (checkDup.contains(fieldName)) {
throw new MySQLOutPutException(ErrorCode.ER_DUP_FIELDNAME, "42S21", " Duplicate column name '" + fieldName + "'");
continue;
}
checkDup.add(fieldName);
fields.add(fieldName);
@@ -194,16 +195,9 @@ public class JoinNode extends PlanNode {
if (table != null) {
return new Pair<>(schema, table);
}
boolean found = false;
for (NamedField field : node.getOuterFields().keySet()) {
if (field.getName().equalsIgnoreCase(using)) {
if (!found) {
found = true;
table = field.getTable();
} else {
throw new MySQLOutPutException(ErrorCode.ER_NON_UNIQ_ERROR, "23000",
" Column '" + using + "' in from clause is ambiguous");
}
table = field.getTable();
}
}
return new Pair<>(schema, table);
@@ -241,49 +235,14 @@ public class JoinNode extends PlanNode {
@Override
protected void dealSingleStarColumn(List<Item> newSels) {
if (usingFields == null) {
super.dealSingleStarColumn(newSels);
if (isNatural || isExistNatural) {
dealSingleStarColumnByNatural(newSels);
} else {
PlanNode driverNode = this.isRightOuterJoin() ? this.getRightNode() : this.getLeftNode();
Pair<String, String> tableInfo = findTbNameByUsing(driverNode, usingFields.get(0));
if (isNatural) {
//is the join is a natural join,the fields order is driverNode's column order
for (NamedField field : driverNode.getInnerFields().keySet()) {
String name = field.getName();
for (String fieldName : usingFields) {
if (name.equals(fieldName)) {
ItemField col = new ItemField(tableInfo.getKey(), tableInfo.getValue(), fieldName);
newSels.add(col);
}
}
}
for (NamedField field : driverNode.getInnerFields().keySet()) {
if (usingFields.contains(field.getName())) {
continue;
}
ItemField col = new ItemField(field.getSchema(), field.getTable(), field.getName());
newSels.add(col);
}
// add Remaining innerFields
for (NamedField field : innerFields.keySet()) {
ItemField col = new ItemField(field.getSchema(), field.getTable(), field.getName());
boolean contians = false;
for (Item f : newSels) {
if (f instanceof ItemField) {
if (f.getItemName().equals(field.getName())) {
contians = true;
break;
}
}
}
if (!contians) {
newSels.add(col);
}
}
if (usingFields == null) {
super.dealSingleStarColumn(newSels);
} else {
PlanNode driverNode = this.isRightOuterJoin() ? this.getRightNode() : this.getLeftNode();
Pair<String, String> tableInfo = findTbNameByUsing(driverNode, usingFields.get(0));
for (String fieldName : usingFields) {
ItemField col = new ItemField(tableInfo.getKey(), tableInfo.getValue(), fieldName);
newSels.add(col);
@@ -300,6 +259,98 @@ public class JoinNode extends PlanNode {
}
}
/**
* https://dev.mysql.com/doc/refman/8.0/en/join.html
* First, coalesced common columns of the two joined tables, in the order in which they occur in the first table
* Second, columns unique to the first table, in order in which they occur in that table
* Third, columns unique to the second table, in order in which they occur in that table
*/
private void dealSingleStarColumnByNatural(List<Item> newSels) {
boolean parentIsJoin = this.getParent() instanceof JoinNode;
if (parentIsJoin) {
((JoinNode) this.getParent()).isExistNatural = true;
}
if (usingFields == null) {
for (NamedField field : innerFields.keySet()) {
if (!parentIsJoin) {
if (field.isNatualShow()) {
ItemField col = new ItemField(field.getSchema(), field.getTable(), field.getName(), field.getCharsetIndex());
newSels.add(col);
}
} else {
ItemField col = new ItemField(field.getSchema(), field.getTable(), field.getName(), field.getCharsetIndex());
if (!field.isNatualShow())
col.noNatualShow();
newSels.add(col);
}
}
return;
} else {
dealSingleStarColumnByNaturalByUsingFields(parentIsJoin, newSels);
}
}
private void dealSingleStarColumnByNaturalByUsingFields(boolean parentIsJoin, List<Item> newSels) {
List<Item> newSelsTmp = new ArrayList<>();
List<Item> usingFieldsTmp = new ArrayList<>();
PlanNode driverNode = this.isRightOuterJoin() ? this.getRightNode() : this.getLeftNode();
// First
for (String fieldName : usingFields) {
for (NamedField field : driverNode.getInnerFields().keySet()) {
String name = field.getName();
if (name.equals(fieldName)) {
ItemField col = new ItemField(field.getSchema(), field.getTable(), field.getName());
usingFieldsTmp.add(col);
break;
}
}
}
// Second
newSelsTmp.addAll(usingFieldsTmp);
for (NamedField field : driverNode.getInnerFields().keySet()) {
ItemField col = new ItemField(field.getSchema(), field.getTable(), field.getName());
if (usingFieldsTmp.contains(col)) {
continue;
}
if (!field.isNatualShow())
col.noNatualShow();
newSelsTmp.add(col);
}
// Third (add Remaining innerFields)
List<Item> naturalColumnsSelected = new LinkedList<>(newSelsTmp);
for (NamedField field : innerFields.keySet()) {
ItemField col = new ItemField(field.getSchema(), field.getTable(), field.getName());
if (!newSelsTmp.contains(col)) {
newSelsTmp.add(col);
boolean contians = false;
for (Item f : naturalColumnsSelected) {
if (f.getItemName().equals(field.getName())) {
contians = true;
break;
}
}
if (!contians) {
naturalColumnsSelected.add(col);
} else {
col.noNatualShow();
field.noShow();
//innerFields.get(field).noShow();
}
}
}
if (!parentIsJoin) {
for (NamedField field : innerFields.keySet()) {
if (!field.isNatualShow()) {
ItemField col = new ItemField(field.getSchema(), field.getTable(), field.getName());
newSelsTmp.remove(col);
}
}
}
newSels.addAll(newSelsTmp);
}
/**
* setupJoinfilters
*
src/main/java/com/actiontech/dble/plan/node/PlanNode.java
+3 -2
View File
@@ -329,7 +329,7 @@ public abstract class PlanNode {
}
String tmpFieldTable = child.getAlias() == null ? coutField.getTable() : child.getAlias();
String tmpFieldName = coutField.getName();
NamedField tmpField = new NamedField(tmpFieldSchema, tmpFieldTable, tmpFieldName, coutField.planNode);
NamedField tmpField = new NamedField(tmpFieldSchema, tmpFieldTable, tmpFieldName, coutField.planNode, coutField.isNatualShow());
tmpField.setCharsetIndex(coutField.getCharsetIndex());
if (innerFields.containsKey(tmpField) && getParent() != null)
throw new MySQLOutPutException(ErrorCode.ER_DUP_FIELDNAME, "42S21", "Duplicate column name '" + tmpFieldName + "'");
@@ -492,7 +492,8 @@ public abstract class PlanNode {
tmpFieldTable = getPureName();
if (sel.getAlias() != null)
tmpFieldName = sel.getAlias();
return new NamedField(tmpSchema, tmpFieldTable, tmpFieldName, this);
boolean isShow = sel instanceof ItemField ? ((ItemField) sel).isNatualShow() : true;
return new NamedField(tmpSchema, tmpFieldTable, tmpFieldName, this, isShow);
}
Item setUpItem(Item sel) {