fix bug of recover early

This commit is contained in:
hebo 2019-10-08 17:54:25 +08:00
parent 1d64e41b58
commit d019ac76cf
3 changed files with 12 additions and 4 deletions

View File

@ -62,10 +62,15 @@ func (mqp *MysqlQueryPiece) Bytes() (content []byte) {
return mqp.jsonContent return mqp.jsonContent
} }
mqp.jsonContent = marsharQueryPieceMonopolize(mqp) mqp.GenerateJsonBytes()
return mqp.jsonContent return mqp.jsonContent
} }
func (mqp *MysqlQueryPiece) GenerateJsonBytes() {
mqp.jsonContent = marsharQueryPieceMonopolize(mqp)
return
}
func (mqp *MysqlQueryPiece) GetSQL() (str *string) { func (mqp *MysqlQueryPiece) GetSQL() (str *string) {
return mqp.QuerySQL return mqp.QuerySQL
} }

View File

@ -19,7 +19,6 @@ func (mqpp *mysqlQueryPiecePool) Enqueue(pmqp *PooledMysqlQueryPiece) {
mqpp.lock.Lock() mqpp.lock.Lock()
defer mqpp.lock.Unlock() defer mqpp.lock.Unlock()
mqpp.queue <- pmqp mqpp.queue <- pmqp
} }

View File

@ -301,10 +301,14 @@ func (ms *MysqlSession) GenerateQueryPiece() (qp model.QueryPiece) {
} }
} }
return filterQueryPieceBySQL(mqp, querySQLInBytes) mqp = filterQueryPieceBySQL(mqp, querySQLInBytes)
if mqp != nil {
mqp.GenerateJsonBytes()
}
return mqp
} }
func filterQueryPieceBySQL(mqp *model.PooledMysqlQueryPiece, querySQL []byte) (model.QueryPiece) { func filterQueryPieceBySQL(mqp *model.PooledMysqlQueryPiece, querySQL []byte) (*model.PooledMysqlQueryPiece) {
if mqp == nil || querySQL == nil { if mqp == nil || querySQL == nil {
return nil return nil