Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

增加前端接收Call命令处理和解决释放后端连接问题 #15

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

增加前端接收Call命令处理和解决释放后端连接问题 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d8c958
1、增加前端接收Call命令处理
zhanghj819 Apr 20, 2017
ae08038
1、前端链接实现load data命令处理
zhanghj819 Apr 21, 2017
b6821ee
1、前端增加接收begin,start transaction,commit,rollback命令传输
zhanghj819 Apr 22, 2017
2581a45
Merge remote-tracking branch 'remotes/mycat2/master'
zhanghj819 May 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
635 changes: 374 additions & 261 deletions Mycat-Core/src/main/java/io/mycat/backend/MySQLBackendConnection.java
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Mycat-Core/src/main/java/io/mycat/backend/callback/DirectTransTofrontCallBack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public void handleResponse(MySQLBackendConnection source, ConDataBuffer dataBuff
MySQLFrontConnection frontCon=getFrontCon(source);
frontCon.getWriteDataBuffer().putBytes(dataBuffer.getBytes(pkgStartPos, pkgLen));
frontCon.enableWrite(false);
source.setNextStatus(packageType);
source.setNextStatus(dataBuffer,packageType,pkgStartPos,pkgLen);

if (source.getState()== Connection.STATE_IDLE)
{
Expand Down
100 changes: 86 additions & 14 deletions Mycat-Core/src/main/java/io/mycat/engine/impl/AbstractSchemaSQLCommandHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import io.mycat.engine.sqlparser.SQLInfo;
import io.mycat.engine.sqlparser.ServerParse;
import io.mycat.front.MySQLFrontConnection;
import io.mycat.mysql.MySQLConnection;
import io.mycat.mysql.packet.MySQLMessage;
import io.mycat.mysql.packet.MySQLPacket;
import io.mycat.mysql.packet.OkPacket;
Expand All @@ -63,20 +64,27 @@ public abstract class AbstractSchemaSQLCommandHandler implements SQLCommandHandl
@Override
public void processCmd(MySQLFrontConnection frontCon, ConDataBuffer dataBuffer, byte packageType, int pkgStartPos,
int pkgLen) throws IOException {
switch (packageType) {
case MySQLPacket.COM_QUIT:
LOGGER.info("Client quit.");
frontCon.close("quit packet");
break;
case MySQLPacket.COM_INIT_DB:
// Implementation: use database;
// @author little-pan
// @since 2016-09-29
final ByteBuffer byteBuff = dataBuffer.getBytes(pkgStartPos, pkgLen);
initDb(frontCon, byteBuff);
break;
default:
doSQLCommand(frontCon, dataBuffer, packageType, pkgStartPos, pkgLen);
if(frontCon.getState() == MySQLConnection.LOAD_DATA){//load data 状态下直接传输数据
passThroughSQL(frontCon, dataBuffer,pkgStartPos, pkgLen);
if(pkgLen == 4){//empty packet 代表传输数据完毕
frontCon.setState(MySQLConnection.STATE_IDLE);
}
}else{
switch (packageType) {
case MySQLPacket.COM_QUIT:
LOGGER.info("Client quit.");
frontCon.close("quit packet");
break;
case MySQLPacket.COM_INIT_DB:
// Implementation: use database;
// @author little-pan
// @since 2016-09-29
final ByteBuffer byteBuff = dataBuffer.getBytes(pkgStartPos, pkgLen);
initDb(frontCon, byteBuff);
break;
default:
doSQLCommand(frontCon, dataBuffer, packageType, pkgStartPos, pkgLen);
}
}
}

Expand Down Expand Up @@ -153,13 +161,43 @@ private void doSQLCommand(MySQLFrontConnection frontCon, ConDataBuffer dataBuffe

executeSelectSQL(frontCon, dataBuffer, packageType,pkgStartPos, pkgLen,sql);

// SelectHandler.handle(sql, con, rs >>> 8);
break;
case ServerParse.CALL:
LOGGER.debug("CALL");
mycatSchema = frontCon.getMycatSchema();
if (mycatSchema == null) {
frontCon.writeErrMessage(ErrorCode.ER_NO_DB_ERROR, "No database selected");
return;
}

executeCallSQL(frontCon, dataBuffer, packageType,pkgStartPos, pkgLen,sql);

// SelectHandler.handle(sql, con, rs >>> 8);
break;
case ServerParse.START:
LOGGER.debug("START");
mycatSchema = frontCon.getMycatSchema();
if (mycatSchema == null) {
frontCon.writeErrMessage(ErrorCode.ER_NO_DB_ERROR, "No database selected");
return;
}

executeSelectSQL(frontCon, dataBuffer, packageType,pkgStartPos, pkgLen,sql);

// SelectHandler.handle(sql, con, rs >>> 8);
break;
case ServerParse.BEGIN:
LOGGER.debug("BEGIN");
mycatSchema = frontCon.getMycatSchema();
if (mycatSchema == null) {
frontCon.writeErrMessage(ErrorCode.ER_NO_DB_ERROR, "No database selected");
return;
}

executeSelectSQL(frontCon, dataBuffer, packageType,pkgStartPos, pkgLen,sql);

// SelectHandler.handle(sql, con, rs >>> 8);
break;
case ServerParse.SAVEPOINT:
LOGGER.debug("SAVEPOINT");
Expand All @@ -182,9 +220,27 @@ private void doSQLCommand(MySQLFrontConnection frontCon, ConDataBuffer dataBuffe
return;
case ServerParse.COMMIT:
LOGGER.debug("COMMIT");
mycatSchema = frontCon.getMycatSchema();
if (mycatSchema == null) {
frontCon.writeErrMessage(ErrorCode.ER_NO_DB_ERROR, "No database selected");
return;
}

executeSelectSQL(frontCon, dataBuffer, packageType,pkgStartPos, pkgLen,sql);

// SelectHandler.handle(sql, con, rs >>> 8);
break;
case ServerParse.ROLLBACK:
LOGGER.debug("ROLLBACK");
mycatSchema = frontCon.getMycatSchema();
if (mycatSchema == null) {
frontCon.writeErrMessage(ErrorCode.ER_NO_DB_ERROR, "No database selected");
return;
}

executeSelectSQL(frontCon, dataBuffer, packageType,pkgStartPos, pkgLen,sql);

// SelectHandler.handle(sql, con, rs >>> 8);
break;
case ServerParse.HELP:
LOGGER.debug("HELP");
Expand All @@ -197,6 +253,16 @@ private void doSQLCommand(MySQLFrontConnection frontCon, ConDataBuffer dataBuffe
break;
case ServerParse.LOAD_DATA_INFILE_SQL:
LOGGER.debug("LOAD_DATA_INFILE_SQL");
mycatSchema = frontCon.getMycatSchema();
if (mycatSchema == null) {
frontCon.writeErrMessage(ErrorCode.ER_NO_DB_ERROR, "No database selected");
return;
}

executeLoadDataSQL(frontCon, dataBuffer, packageType,pkgStartPos, pkgLen,sql);
frontCon.setState(MySQLConnection.LOAD_DATA);

// SelectHandler.handle(sql, con, rs >>> 8);
break;
default:
LOGGER.debug("DEFAULT");
Expand Down Expand Up @@ -275,4 +341,10 @@ public abstract void executeShowSQL(MySQLFrontConnection frontCon, ConDataBuffer

public abstract void executeSelectSQL(MySQLFrontConnection frontCon, ConDataBuffer dataBuffer, byte packageType,
int pkgStartPos, int pkgLen,String sql) throws IOException;

public abstract void executeCallSQL(MySQLFrontConnection frontCon, ConDataBuffer dataBuffer, byte packageType,
int pkgStartPos, int pkgLen,String sql) throws IOException;

public abstract void executeLoadDataSQL(MySQLFrontConnection frontCon, ConDataBuffer dataBuffer, byte packageType,
int pkgStartPos, int pkgLen,String sql) throws IOException;
}
14 changes: 14 additions & 0 deletions Mycat-Core/src/main/java/io/mycat/engine/impl/NormalSchemaSQLCommandHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,20 @@ public void executeSelectSQL(MySQLFrontConnection frontCon, ConDataBuffer dataBu
passThroughSQL(frontCon, dataBuffer, pkgStartPos, pkgLen);

}

@Override
public void executeCallSQL(MySQLFrontConnection frontCon, ConDataBuffer dataBuffer, byte packageType,
int pkgStartPos, int pkgLen, String sql) throws IOException {
passThroughSQL(frontCon, dataBuffer, pkgStartPos, pkgLen);

}

@Override
public void executeLoadDataSQL(MySQLFrontConnection frontCon, ConDataBuffer dataBuffer, byte packageType,
int pkgStartPos, int pkgLen, String sql) throws IOException {
passThroughSQL(frontCon, dataBuffer, pkgStartPos, pkgLen);

}



Expand Down
15 changes: 15 additions & 0 deletions Mycat-Core/src/main/java/io/mycat/engine/impl/PartionSchemaSQLCommandHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,19 @@ public void executeSelectSQL(MySQLFrontConnection frontCon, ConDataBuffer dataBu

}


@Override
public void executeCallSQL(MySQLFrontConnection frontCon, ConDataBuffer dataBuffer, byte packageType,
int pkgStartPos, int pkgLen, String sql) throws IOException {
frontCon.writeErrMessage(ErrorCode.ER_BAD_DB_ERROR, "Not implemented Yet,Welcome to be a Commiter ,Leader want you !!");
}


@Override
public void executeLoadDataSQL(MySQLFrontConnection frontCon, ConDataBuffer dataBuffer, byte packageType,
int pkgStartPos, int pkgLen, String sql) throws IOException {
frontCon.writeErrMessage(ErrorCode.ER_BAD_DB_ERROR, "Not implemented Yet,Welcome to be a Commiter ,Leader want you !!");

}

}
Loading