Skip to content

V
validator
Commit c09f8572 authored by 贾浩@五瓣科技's avatar 贾浩@五瓣科技
Browse files
Options

fix pending workload resp

parent fa1beb0f
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
quest/db.go
View file @ c09f8572
...@@ -46,21 +46,21 @@ func (q *Quest) GetProofs(startTimestamp, endTimestamp int64, lastTaskID string, ...@@ -46,21 +46,21 @@ func (q *Quest) GetProofs(startTimestamp, endTimestamp int64, lastTaskID string,
} }
func (q *Quest) GetPendingWorkload(startTimestamp int64, address string) (workload uint64, err error) { func (q *Quest) GetPendingWorkload(startTimestamp int64, address string) (workload uint64, err error) {
proof := new(ProofModel) // proof := new(ProofModel)
querySQL := "SELECT " + querySQL := "SELECT COUNT(`TaskWorkload`)" +
"`TaskWorkload`, `TaskReqHash`, `TaskRespHash`, `TaskManagerSignature`, `TaskContainerSignature`, `TaskMinerSignature`, `TaskProfitAccount`, `TaskWorkerAccount` " + // "`TaskWorkload`, `TaskReqHash`, `TaskRespHash`, `TaskManagerSignature`, `TaskContainerSignature`, `TaskMinerSignature`, `TaskProfitAccount`, `TaskWorkerAccount` " +
"FROM `proof` " + "FROM `proof` " +
"WHERE `TaskFinishTimestamp` >= ? " + "WHERE `TaskFinishTimestamp` >= ? " +
"AND `TaskProfitAccount` = ? ;" "AND `TaskProfitAccount` = ? ;"
err = q.db.Raw(querySQL, startTimestamp, address).First(&proof).Error err = q.db.Raw(querySQL, startTimestamp, address).Scan(&workload).Error
if err != nil { if err != nil {
if err == gorm.ErrRecordNotFound { if err == gorm.ErrRecordNotFound {
return 0, nil return 0, nil
} }
return 0, err return 0, err
} }
return proof.TaskWorkload, nil return workload, nil
} }
func (q *Quest) GetGlobalWorkload(startTimestamp int64) (workload uint64, err error) { func (q *Quest) GetGlobalWorkload(startTimestamp int64) (workload uint64, err error) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment