mirror/dble
1
0
Fork 0
mirror of https://github.com/actiontech/dble.git synced 2026-05-08 07:21:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.17.09.0/rel'

Browse Source
This commit is contained in:
yanhuqing
2017-10-25 16:14:05 +08:00
parent 5f5610fe53 45f7d37233
commit 44c72c2cdf
10 changed files with 120 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/actiontech/dble/backend/mysql/nio/MySQLConnection.java
+6 -1
View File
@@ -18,8 +18,8 @@ import com.actiontech.dble.route.RouteResultsetNode;
import com.actiontech.dble.route.parser.util.Pair;
import com.actiontech.dble.server.NonBlockingSession;
import com.actiontech.dble.server.ServerConnection;
import com.actiontech.dble.server.variables.SystemVariables;
import com.actiontech.dble.server.parser.ServerParse;
import com.actiontech.dble.server.variables.SystemVariables;
import com.actiontech.dble.util.StringUtil;
import com.actiontech.dble.util.TimeUtil;
import com.actiontech.dble.util.exception.UnknownTxIsolationException;
@@ -429,6 +429,11 @@ public class MySQLConnection extends BackendAIOConnection {
//tmp now = backend -(backend &&frontend)
for (Map.Entry<String, String> entry : tmpSysVars.entrySet()) {
String value = SystemVariables.getSysVars().getDefaultValue(entry.getKey());
try {
Long.parseLong(value);
} catch (NumberFormatException e) {
value = "`" + value + "`";
}
setVars.add(new Pair<>(entry.getKey(), value));
toResetSys.add(entry.getKey());
}
src/main/java/com/actiontech/dble/backend/mysql/nio/handler/NewConnectionRespHandler.java
+13 -4
View File
@@ -11,6 +11,7 @@ import com.actiontech.dble.net.mysql.RowDataPacket;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.List;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
@@ -21,16 +22,19 @@ public class NewConnectionRespHandler implements ResponseHandler {
private ReentrantLock lock = new ReentrantLock();
private Condition initiated = lock.newCondition();
public BackendConnection getBackConn() {
public BackendConnection getBackConn() throws IOException {
lock.lock();
try {
while (backConn == null) {
if (backConn == null) {
initiated.await();
}
if (backConn == null) {
throw new IOException("get backend connection error ");
}
return backConn;
} catch (InterruptedException e) {
LOGGER.warn("getBackConn " + e);
return null;
throw new IOException(e.getMessage());
} finally {
lock.unlock();
}
@@ -39,7 +43,12 @@ public class NewConnectionRespHandler implements ResponseHandler {
@Override
public void connectionError(Throwable e, BackendConnection conn) {
LOGGER.warn(conn + " connectionError " + e);
lock.lock();
try {
initiated.signal();
} finally {
lock.unlock();
}
}
@Override
src/main/java/com/actiontech/dble/backend/mysql/nio/handler/builder/sqlvisitor/GlobalVisitor.java
+12 -15
View File
@@ -74,6 +74,8 @@ public class GlobalVisitor extends MysqlVisitor {
buildHaving(query);
buildOrderBy(query);
buildLimit(query);
} else {
whereFilter = query.getWhereFilter();
}
if (query.isSubQuery() && !parentIsQuery && !isTopQuery) {
@@ -146,10 +148,9 @@ public class GlobalVisitor extends MysqlVisitor {
if (!isTopQuery) {
sqlBuilder.append(" ( ");
}
if (join.isSubQuery() || isTopQuery) {
buildSelect(join);
sqlBuilder.append(" from ");
}
buildSelect(join);
sqlBuilder.append(" from ");
PlanNode left = join.getLeftNode();
MysqlVisitor leftVisitor = new GlobalVisitor(left, false);
@@ -182,31 +183,27 @@ public class GlobalVisitor extends MysqlVisitor {
}
if (join.getOtherJoinOnFilter() != null) {
if (first) {
first = false;
} else {
if (!first) {
joinOnFilterStr.append(" and ");
}
joinOnFilterStr.append(join.getOtherJoinOnFilter());
}
sqlBuilder.append(joinOnFilterStr.toString());
if (join.isSubQuery() || isTopQuery) {
buildWhere(join);
buildGroupBy(join);
buildHaving(join);
buildOrderBy(join);
buildLimit(join);
}
buildWhere(join);
buildGroupBy(join);
buildHaving(join);
buildOrderBy(join);
buildLimit(join);
if (!isTopQuery) {
sqlBuilder.append(" ) ");
if (join.getAlias() != null)
sqlBuilder.append(" ").append(join.getAlias()).append(" ");
}
}
protected void buildSelect(PlanNode query) {
sqlBuilder.append("select ");
boolean hasDistinct = query.isDistinct();
src/main/java/com/actiontech/dble/backend/mysql/nio/handler/builder/sqlvisitor/MysqlVisitor.java
+7 -2
View File
@@ -40,8 +40,7 @@ public abstract class MysqlVisitor {
// tmp sql
protected StringBuilder sqlBuilder;
protected StringPtr replaceableWhere = new StringPtr("");
protected Item whereFilter = null;
public MysqlVisitor(PlanNode query, boolean isTopQuery) {
this.query = query;
this.isTopQuery = isTopQuery;
@@ -89,6 +88,7 @@ public abstract class MysqlVisitor {
String pdName = visitUnSelPushDownName(filter, false);
whereBuilder.append(" where ").append(pdName);
}
replaceableWhere.set(whereBuilder.toString());
// refresh sqlbuilder
sqlBuilder = replaceableSqlBuilder.getCurrentElement().getSb();
@@ -125,4 +125,9 @@ public abstract class MysqlVisitor {
}
return selName;
}
public Item getWhereFilter() {
return whereFilter;
}
}
src/main/java/com/actiontech/dble/backend/mysql/nio/handler/builder/sqlvisitor/PushDownVisitor.java
+71 -21
View File
@@ -112,29 +112,10 @@ public class PushDownVisitor extends MysqlVisitor {
rightVisitor.visit();
replaceableSqlBuilder.append(rightVisitor.getSql());
sqlBuilder = replaceableSqlBuilder.getCurrentElement().getSb();
StringBuilder joinOnFilterStr = new StringBuilder();
boolean first = true;
for (int i = 0; i < join.getJoinFilter().size(); i++) {
Item filter = join.getJoinFilter().get(i);
if (first) {
sqlBuilder.append(" on ");
first = false;
} else
joinOnFilterStr.append(" and ");
joinOnFilterStr.append(filter);
}
if (join.getOtherJoinOnFilter() != null) {
if (first) {
first = false;
} else {
joinOnFilterStr.append(" and ");
}
joinOnFilterStr.append(join.getOtherJoinOnFilter());
}
StringBuilder joinOnFilterStr = getJoinOn(join, leftVisitor, rightVisitor);
sqlBuilder.append(joinOnFilterStr.toString());
if (join.isSubQuery() || isTopQuery) {
buildWhere(join);
buildWhere(join, leftVisitor.getWhereFilter(), rightVisitor.getWhereFilter());
buildGroupBy(join);
// having may contains aggregate function, so it need to calc by middle-ware
buildOrderBy(join);
@@ -149,6 +130,75 @@ public class PushDownVisitor extends MysqlVisitor {
}
private StringBuilder getJoinOn(JoinNode join, MysqlVisitor leftVisitor, MysqlVisitor rightVisitor) {
StringBuilder joinOnFilterStr = new StringBuilder();
boolean first = true;
for (int i = 0; i < join.getJoinFilter().size(); i++) {
Item filter = join.getJoinFilter().get(i);
if (first) {
sqlBuilder.append(" on ");
first = false;
} else
joinOnFilterStr.append(" and ");
joinOnFilterStr.append(filter);
}
if (join.getOtherJoinOnFilter() != null) {
if (!first) {
joinOnFilterStr.append(" and ");
}
joinOnFilterStr.append(join.getOtherJoinOnFilter());
}
// is not left join
if (leftVisitor.getWhereFilter() != null && !join.getLeftOuter()) {
if (!first) {
joinOnFilterStr.append(" and ");
}
joinOnFilterStr.append("(");
joinOnFilterStr.append(leftVisitor.getWhereFilter());
joinOnFilterStr.append(")");
}
// is not right join
if (rightVisitor.getWhereFilter() != null && !join.getRightOuter()) {
if (!first) {
joinOnFilterStr.append(" and ");
}
joinOnFilterStr.append("(");
joinOnFilterStr.append(rightVisitor.getWhereFilter());
joinOnFilterStr.append(")");
}
return joinOnFilterStr;
}
protected void buildWhere(JoinNode planNode, Item leftFilter, Item rightFilter) {
if (!visited)
replaceableSqlBuilder.getCurrentElement().setRepString(replaceableWhere);
StringBuilder whereBuilder = new StringBuilder();
Item filter = planNode.getWhereFilter();
if (filter != null) {
String pdName = visitUnSelPushDownName(filter, false);
whereBuilder.append(" where ").append(pdName);
} else {
whereBuilder.append(" where 1=1 ");
}
// left join
if (leftFilter != null && !planNode.getRightOuter() && planNode.getLeftOuter()) {
String pdName = visitUnSelPushDownName(leftFilter, false);
whereBuilder.append(" and (");
whereBuilder.append(pdName);
whereBuilder.append(")");
}
//right join
if (rightFilter != null && !planNode.getLeftOuter() && planNode.getRightOuter()) {
String pdName = visitUnSelPushDownName(rightFilter, false);
whereBuilder.append(" and (");
whereBuilder.append(pdName);
whereBuilder.append(")");
}
replaceableWhere.set(whereBuilder.toString());
// refresh sqlbuilder
sqlBuilder = replaceableSqlBuilder.getCurrentElement().getSb();
}
protected void buildSelect(PlanNode query) {
sqlBuilder.append("select ");
List<Item> columns = query.getColumnsRefered();
src/main/java/com/actiontech/dble/backend/mysql/nio/handler/transaction/AbstractCommitNodesHandler.java
+5
View File
@@ -105,6 +105,11 @@ public abstract class AbstractCommitNodesHandler extends MultiNodeHandler implem
}
@Override
public void reset(int initCount) {
nodeCount = initCount;
packetId = 0;
}
public void debugCommitDelay() {
src/main/java/com/actiontech/dble/backend/mysql/nio/handler/transaction/xa/XACommitNodesHandler.java
+1 -1
View File
@@ -88,7 +88,7 @@ public class XACommitNodesHandler extends AbstractCommitNodesHandler {
public void run() {
ErrorPacket error = new ErrorPacket();
error.setErrNo(ER_ERROR_DURING_COMMIT);
error.setMessage(errorMsg.getBytes());
error.setMessage(errorMsg == null ? "unknow error".getBytes() : errorMsg.getBytes());
XAAutoRollbackNodesHandler nextHandler = new XAAutoRollbackNodesHandler(session, error.toBytes(), null, null);
nextHandler.rollback();
}
src/main/java/com/actiontech/dble/backend/mysql/nio/handler/transaction/xa/XARollbackNodesHandler.java
+2 -1
View File
@@ -341,7 +341,8 @@ public class XARollbackNodesHandler extends AbstractRollbackNodesHandler {
session.getSource().write(send);
//partitionly commited,must commit again
} else if (session.getXaState() == TxState.TX_ROLLBACK_FAILED_STATE || session.getXaState() == TxState.TX_PREPARED_STATE) {
} else if (session.getXaState() == TxState.TX_ROLLBACK_FAILED_STATE || session.getXaState() == TxState.TX_PREPARED_STATE ||
session.getXaState() == TxState.TX_PREPARE_UNCONNECT_STATE) {
MySQLConnection errConn = session.releaseExcept(session.getXaState());
if (errConn != null) {
XAStateLog.saveXARecoveryLog(session.getSessionXaID(), session.getXaState());
src/main/java/com/actiontech/dble/plan/optimizer/SubQueryProcessor.java
+2 -1
View File
@@ -127,7 +127,8 @@ public final class SubQueryProcessor {
private static void mergeWhere(PlanNode parent, PlanNode child) {
Item pWhere = parent.getWhereFilter();
Item pWhere0 = PlanUtil.pushDownItem(parent, pWhere, true);
Item mWhere = FilterUtils.and(pWhere0, child.getWhereFilter());
Item childWhere = PlanUtil.pushDownItem(child, child.getWhereFilter(), true);
Item mWhere = FilterUtils.and(pWhere0, childWhere);
child.setWhereFilter(mWhere);
}
src/main/java/com/actiontech/dble/plan/visitor/MySQLPlanNodeVisitor.java
+1 -1
View File
@@ -237,7 +237,7 @@ public class MySQLPlanNodeVisitor {
this.tableNode.setSubQuery(true);
if (subQueryTables.getAlias() != null) {
tableNode.alias(subQueryTables.getAlias());
if (tableNode.getSubAlias() == null) {
if (tableNode.getSubAlias() == null && tableNode.type() == PlanNode.PlanNodeType.TABLE) {
tableNode.setSubAlias(tableNode.getAlias());
}
}