From d19fdcd3f11e4e092957880bc9f81b8d0429d0a2 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 14 八月 2019 13:07:51 +0800
Subject: [PATCH] Query return dumpSqls
---
agent.go | 51 ++++++++++++++++++++++++++++-----------------------
1 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/agent.go b/agent.go
index 8b0cf36..37e379e 100644
--- a/agent.go
+++ b/agent.go
@@ -25,6 +25,7 @@
"io/ioutil"
"net"
"os"
+ "sync"
//"os"
"strings"
@@ -178,13 +179,14 @@
fmt.Println("Query tableNames unmarshal err")
return
}
+ fmt.Println("Query tableNames:",tableNames)
datas, err := ExecuteQueryByGorm(tableNames)
if err !=nil {
fmt.Println("queryByGorm err")
return
}
bytesReturn, err := json.Marshal(datas)
- fmt.Println("results: ", bytesReturn)
+ fmt.Println("results.len: ", len(bytesReturn))
if query, ok := event.(*serf.Query); ok {
if err := query.Respond(bytesReturn); err != nil {
fmt.Printf("err: %s\n", err)
@@ -417,17 +419,18 @@
//GetDbFromCluster get the newest database after join cluster
//dbPathWrite the path where to write after got a database,
-func (a *Agent) GetTableDataFromCluster(tableNames []string) error {
+func (a *Agent) GetTableDataFromCluster(tableNames []string) (*[]string,error) {
//members: get name of first member
mbs := a.GroupMembers(a.conf.ClusterID)
var specmembername string
for _, m := range mbs {
- if m.Addr.String() != a.conf.BindAddr {
+ fmt.Println("m",m)
+ if m.Name != a.conf.NodeName {
specmembername = m.Name
break
}
}
- fmt.Println(specmembername)
+ fmt.Println("mbs:",mbs,"a.conf.BindAddr:",a.conf.BindAddr,"specmembername:",specmembername)
//query: get db file.
params := serf.QueryParam{
@@ -443,25 +446,27 @@
}
fmt.Println("Query.resp.err:",err,"resp:",resp)
- //go func() {
- // respCh := resp.ResponseCh()
- // for {
- // select {
- // case r := <-respCh:
- // fmt.Println("x length is: ", len(r.Payload))
- // // // byte to file.
- // var dumpSqls []string
- // err := json.Unmarshal(r.Payload, &dumpSqls)
- // if err ==nil {
- // if flag,_ := ExecuteSqlByGorm(dumpSqls);flag{
- // fmt.Println("data dump success")
- // }
- // }
- // return
- // }
- // }
- //}()
- return err
+ var wg sync.WaitGroup
+ wg.Add(1)
+ var dumpSqls []string
+ go func() {
+ defer wg.Done()
+ respCh := resp.ResponseCh()
+ for {
+ 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)
+ fmt.Println("data dump success")
+ }
+ return
+ }
+ }
+ }()
+ wg.Wait()
+ return &dumpSqls,nil
//r, err = c.Query([]string{query}, false, false)
//if err != nil {
--
Gitblit v1.8.0