From e99db8571c51d5203e847b374bd8bd6210803485 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 13 五月 2020 18:08:15 +0800
Subject: [PATCH] add dbDump handler and getDbFromCluster
---
agent.go | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/agent.go b/agent.go
index c3b488c..5b92cb9 100644
--- a/agent.go
+++ b/agent.go
@@ -130,6 +130,26 @@
receiveSqlInterface = c
}
+type DbHandler interface {
+ Execute(sql string) bool
+}
+
+type DbDumpHandler interface {
+ Dump(tables string) string
+}
+
+//鏁版嵁搴揺xecute鍙ユ焺
+var DbHandle DbHandler
+//鏁版嵁搴撳浠藉彞鏌�,鍙湪syncdb涓敤鍒�
+var dbDumpH DbDumpHandler
+
+func RegisterDbHandler(h DbHandler) {
+ DbHandle = h
+}
+
+func RegisterDbDumpHandler(h DbDumpHandler) {
+ dbDumpH = h
+}
// HandleEvent Handles serf.EventMemberJoin events,
// which will wait for members to join until the number of group members is equal to "groupExpect"
@@ -191,23 +211,11 @@
} else if ev.Name == QueryEventUpdateDBData {
//fmt.Println(string(ev.Payload))
var tableNames []string
- err := json.Unmarshal(ev.Payload, &tableNames)
- if err !=nil {
- //fmt.Println("Query tableNames unmarshal err")
- return
- }
+ json.Unmarshal(ev.Payload, &tableNames)
- rows, err := ExecuteQuerySql(tableNames)
- if err != nil {
- //fmt.Println("err: ", err)
- return
- }
- var rowsReturn []Rows
- for _, r := range rows {
- rowsReturn = append(rowsReturn, *r)
- }
+ dumpData := dbDumpH.Dump(strings.Join(tableNames, ","))
- bytesReturn, err := json.Marshal(rowsReturn)
+ bytesReturn, _ := json.Marshal(dumpData)
//fmt.Println("results: ", bytesReturn)
if query, ok := event.(*serf.Query); ok {
if err := query.Respond(bytesReturn); err != nil {
@@ -446,8 +454,8 @@
for _, m := range mbs {
//fmt.Println("m", m)
if m.Name != a.conf.NodeName { //鍓嶇紑锛欴SVAD:鍒嗘瀽鏈嶅姟鍣� DSPAD:杩涘嚭鍏ad
- if strings.HasPrefix(a.conf.NodeName, "DSVAD"){
- if strings.HasPrefix(m.Name, "DSVAD") {
+ if strings.HasPrefix(a.conf.NodeName, "PSPAD"){
+ if strings.HasPrefix(m.Name, "PSPAD") {
specmembername = m.Name
break
}
--
Gitblit v1.8.0