From f91232c13c2682a6cf9ef4b46ecadee8deb372fd Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 21 十月 2023 17:57:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/apsClient
---
serf/sync.go | 7 ++++++-
serf/sqlite.go | 5 +----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/serf/sqlite.go b/serf/sqlite.go
index 8c83904..6ab2f6c 100644
--- a/serf/sqlite.go
+++ b/serf/sqlite.go
@@ -41,15 +41,12 @@
tSql := fmt.Sprintf(`PRAGMA table_info("%s")`, table)
err := db.Raw(tSql).Scan(&tDescArr).Error
-
- fmt.Println("tDescArr err:", err, "len(tDescArr)=", len(tDescArr))
if err != nil {
return nil, errors.New("tableDesc err")
}
- fmt.Println(table, "'Columns is:", tDescArr)
if tDescArr == nil || len(tDescArr) == 0 {
- return nil, errors.New(table + " has no column")
+ continue
}
var columnNames []string
diff --git a/serf/sync.go b/serf/sync.go
index c92fe96..13f66ea 100644
--- a/serf/sync.go
+++ b/serf/sync.go
@@ -410,10 +410,11 @@
//fmt.Println("鍚屾鍏ㄩ噺鏁版嵁缁欒妭鐐�:", targetId)
sqls, err := DumpTables(ss.sqlDB, ss.syncTables)
if err != nil {
- fmt.Println("DumpTables error, ", err.Error())
+ logx.Errorf("DumpTables error: %s", err.Error())
return err
}
+ logx.Infof("DumpTables sql:%v", sqls)
syncSql := strings.Join(sqls, ";")
if len(syncSql) < sizeLimit {
err = ss.pubSyncSqlMessage([]byte(syncSql), targetId)
@@ -427,6 +428,10 @@
shard = fmt.Sprintf("%s%s;", shard, sql)
}
+
+ if len(shard) >0 {
+ err = ss.pubSyncSqlMessage([]byte(shard), targetId)
+ }
}
return err
--
Gitblit v1.8.0