fix Query unmarshal

liuxiaolong

2020-05-14 b83d511e4ec77556800ee8a459a40c8f94262c45

 agent.go

@@ -167,9 +167,6 @@
            return
         }
         if sqlUe.Owner != a.conf.NodeName {
            //ExecuteWriteSql(sqlUe.Sql, true)
            //flag, _ := ExecuteSqlByGorm(sqlUe.Sql)
            //fmt.Println("userEvent exec 1 ", sqlUe.Sql, ",Result:", results)
            if receiveSqlInterface != nil && sqlUe.Sql !=nil && len(sqlUe.Sql) > 0 {
               receiveSqlInterface.Forward(sqlUe.Sql[0])
            }
@@ -215,7 +212,7 @@

         dumpData := dbDumpH.Dump(strings.Join(tableNames, ","))

         bytesReturn, _ := json.Marshal(dumpData)
         bytesReturn := []byte(dumpData)
         fmt.Println("androidSync len(bytesReturn): ", len(bytesReturn))
         if query, ok := event.(*serf.Query); ok {
            if err := query.Respond(bytesReturn); err != nil {
@@ -232,9 +229,8 @@
            leaveMember := ev.Members[0]
            leaveSql := "delete from cluster_node where node_id='" + leaveMember.Name + "'"
            //fmt.Println("leaveSql:", leaveSql)
            _, err := ExecuteWriteSql([]string{leaveSql}, false)
            if err != nil {
               //fmt.Printf("err: %s\n", err)
            if !DbHandle.Execute(leaveSql) {
               fmt.Println("DbHandle.Execute ret false")
            }

            //fmt.Println("EventMemberLeave,current Members:", ev.Members)
@@ -449,7 +445,7 @@

//GetDbFromCluster get the newest database after join cluster
//dbPathWrite the path where to write after got a database,
func (a *Agent) GetTableDataFromCluster(tableNames []string) (*[]string, error) {
func (a *Agent) GetTableDataFromCluster(tableNames []string) (*string, error) {
   //members: get name of first member
   mbs := a.GroupMembers(a.conf.ClusterID)
   specmembername := ""
@@ -485,7 +481,7 @@

   var wg sync.WaitGroup
   wg.Add(1)
   var dumpSqls []string
   var dumpSqls string
   go func() {
      defer wg.Done()
      respCh := resp.ResponseCh()
@@ -493,12 +489,11 @@
         select {
         case r := <-respCh:
            fmt.Println("Query response's len:", len(r.Payload))
            err := json.Unmarshal(r.Payload, &dumpSqls)
            if err == nil {
               fmt.Println("dumpSql:", dumpSqls)
            dumpSqls = string(r.Payload)
            if len(dumpSqls) >0 {
               fmt.Println("data dump success")
            } else {
               fmt.Println("Query response.err:", err)
               fmt.Println("Query response.len = 0")
            }
            return
         }