From fce8ab3a40c388eaaf9d3b10e21253838c658ce3 Mon Sep 17 00:00:00 2001 From: lancewang Date: Tue, 18 Oct 2016 14:22:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=92=88=E5=AF=B9=E8=87=AA=E5=B7=B1?= =?UTF-8?q?=E7=9A=84=E5=B7=A5=E4=BD=9C=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B8=AD=E7=9A=84=E5=8C=85=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/FileBinlogReader.go | 5 +++-- client/FormatDescriptionLogEvent.go | 4 ++-- client/IBinlogReader.go | 2 +- client/LogHeader.go | 2 +- client/LogParser.go | 9 +++++---- client/NetBinlogReader.go | 5 +++-- client/QueryLogEvent.go | 4 ++-- client/RotateLogEvent.go | 2 +- client/RowsQueryEvent.go | 2 +- client/SkipParse.go | 6 +++--- client/TableMapLogEvent.go | 2 +- client/TableMetaCache.go | 2 +- client/Transaction.go | 2 +- client/previous_gtids_event.go | 5 +++-- instance/Instance.go | 4 ++-- main/main.go | 5 +++-- main/sqlregret.conf | 12 ++++++------ parser/EventParser.go | 7 ++++--- 18 files changed, 43 insertions(+), 37 deletions(-) diff --git a/client/FileBinlogReader.go b/client/FileBinlogReader.go index 326198c..cc41520 100644 --- a/client/FileBinlogReader.go +++ b/client/FileBinlogReader.go @@ -11,8 +11,9 @@ import ( "strings" "time" - "github.com/SDHM/sqlregret/binlogevent" - . "github.com/SDHM/sqlregret/mysql" + "sqlregret/binlogevent" + . "sqlregret/mysql" + "github.com/cihub/seelog" ) diff --git a/client/FormatDescriptionLogEvent.go b/client/FormatDescriptionLogEvent.go index 2e7732d..6095810 100755 --- a/client/FormatDescriptionLogEvent.go +++ b/client/FormatDescriptionLogEvent.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" - . "github.com/SDHM/sqlregret/binlogevent" - "github.com/SDHM/sqlregret/mysql" + . "sqlregret/binlogevent" + "sqlregret/mysql" ) const ( diff --git a/client/IBinlogReader.go b/client/IBinlogReader.go index bfb92d3..e8c005e 100644 --- a/client/IBinlogReader.go +++ b/client/IBinlogReader.go @@ -1,7 +1,7 @@ package client import ( - . "github.com/SDHM/sqlregret/mysql" + . "sqlregret/mysql" ) type IBinlogReader interface { diff --git a/client/LogHeader.go b/client/LogHeader.go index bca28eb..75ebfa1 100755 --- a/client/LogHeader.go +++ b/client/LogHeader.go @@ -1,7 +1,7 @@ package client import ( - "github.com/SDHM/sqlregret/mysql" + "sqlregret/mysql" ) type LogHeader struct { diff --git a/client/LogParser.go b/client/LogParser.go index f458451..6b86961 100644 --- a/client/LogParser.go +++ b/client/LogParser.go @@ -8,10 +8,11 @@ import ( "strings" "time" - . "github.com/SDHM/sqlregret/binlogevent" - "github.com/SDHM/sqlregret/config" - "github.com/SDHM/sqlregret/mysql" - "github.com/SDHM/sqlregret/protocol" + . "sqlregret/binlogevent" + + "sqlregret/config" + "sqlregret/mysql" + "sqlregret/protocol" "github.com/cihub/seelog" "github.com/golang/protobuf/proto" ) diff --git a/client/NetBinlogReader.go b/client/NetBinlogReader.go index db3a74a..724413a 100644 --- a/client/NetBinlogReader.go +++ b/client/NetBinlogReader.go @@ -10,8 +10,9 @@ import ( "strings" "time" - "github.com/SDHM/sqlregret/binlogevent" - . "github.com/SDHM/sqlregret/mysql" + "sqlregret/binlogevent" + . "sqlregret/mysql" + "github.com/cihub/seelog" ) diff --git a/client/QueryLogEvent.go b/client/QueryLogEvent.go index c9a189e..ff47975 100755 --- a/client/QueryLogEvent.go +++ b/client/QueryLogEvent.go @@ -1,8 +1,8 @@ package client import ( - . "github.com/SDHM/sqlregret/binlogevent" - "github.com/SDHM/sqlregret/mysql" + . "sqlregret/binlogevent" + "sqlregret/mysql" ) type QueryLogEvent struct { diff --git a/client/RotateLogEvent.go b/client/RotateLogEvent.go index d980de2..a1887d0 100755 --- a/client/RotateLogEvent.go +++ b/client/RotateLogEvent.go @@ -1,7 +1,7 @@ package client import ( - "github.com/SDHM/sqlregret/mysql" + "sqlregret/mysql" ) type RotateLogEvent struct { diff --git a/client/RowsQueryEvent.go b/client/RowsQueryEvent.go index 727893b..5cc2083 100644 --- a/client/RowsQueryEvent.go +++ b/client/RowsQueryEvent.go @@ -1,6 +1,6 @@ package client -import "github.com/SDHM/sqlregret/mysql" +import "sqlregret/mysql" type RowsQueryEvent struct { queryString string diff --git a/client/SkipParse.go b/client/SkipParse.go index 1d721ca..710d5ab 100644 --- a/client/SkipParse.go +++ b/client/SkipParse.go @@ -5,9 +5,9 @@ import ( "os" "time" - "github.com/SDHM/sqlregret/binlogevent" - "github.com/SDHM/sqlregret/config" - "github.com/SDHM/sqlregret/protocol" + "sqlregret/binlogevent" + "sqlregret/config" + "sqlregret/protocol" ) // 返回为false 表示不过滤 返回为true 表示过滤 diff --git a/client/TableMapLogEvent.go b/client/TableMapLogEvent.go index 36962ef..b17fae1 100755 --- a/client/TableMapLogEvent.go +++ b/client/TableMapLogEvent.go @@ -1,6 +1,6 @@ package client -import . "github.com/SDHM/sqlregret/mysql" +import . "sqlregret/mysql" type Column struct { ColumnType byte diff --git a/client/TableMetaCache.go b/client/TableMetaCache.go index e412bd6..ad7c7c5 100755 --- a/client/TableMetaCache.go +++ b/client/TableMetaCache.go @@ -1,7 +1,7 @@ package client import ( - "github.com/SDHM/sqlregret/mysql" + "sqlregret/mysql" ) type TableMetaCache struct { diff --git a/client/Transaction.go b/client/Transaction.go index 1995763..9078d8e 100644 --- a/client/Transaction.go +++ b/client/Transaction.go @@ -3,7 +3,7 @@ package client import ( "fmt" - "github.com/SDHM/sqlregret/config" + "sqlregret/config" ) //收集事务消息 diff --git a/client/previous_gtids_event.go b/client/previous_gtids_event.go index e6414ca..5e5d8a2 100644 --- a/client/previous_gtids_event.go +++ b/client/previous_gtids_event.go @@ -3,8 +3,9 @@ package client import ( "fmt" - . "github.com/SDHM/sqlregret/binlogevent" - "github.com/SDHM/sqlregret/mysql" + . "sqlregret/binlogevent" + + "sqlregret/mysql" ) type Previous_Gtids_Log_Event struct { diff --git a/instance/Instance.go b/instance/Instance.go index d25bcb7..f87d1b4 100755 --- a/instance/Instance.go +++ b/instance/Instance.go @@ -5,8 +5,8 @@ import ( "runtime" "sync" - "github.com/SDHM/sqlregret/config" - "github.com/SDHM/sqlregret/parser" + "sqlregret/config" + "sqlregret/parser" ) type Instance struct { diff --git a/main/main.go b/main/main.go index 958ca98..7388217 100755 --- a/main/main.go +++ b/main/main.go @@ -10,8 +10,9 @@ import ( "strings" "time" - "github.com/SDHM/sqlregret/config" - "github.com/SDHM/sqlregret/instance" + "sqlregret/config" + "sqlregret/instance" + "github.com/cihub/seelog" ) diff --git a/main/sqlregret.conf b/main/sqlregret.conf index c63320d..44b6dc4 100755 --- a/main/sqlregret.conf +++ b/main/sqlregret.conf @@ -1,13 +1,13 @@ { "masterPosition" : 4, - "mode" : "online", - "basePath":"/usr/local/mysql/data", + "mode" : "onfile", + "basePath":"/usr/local/var/mysql/binlog", "indexFile":"mysql-bin.index", "masterJournalName" : "mysql-bin.000001", "masterPort" : 3306, "masterAddress" : "127.0.0.1", "slaveId" : 5, - "dbPassword" : "123456", - "defaultDbName" : "app", - "dbUsername" : "reader" -} + "dbPassword" : "", + "defaultDbName" : "test", + "dbUsername" : "root" +} \ No newline at end of file diff --git a/parser/EventParser.go b/parser/EventParser.go index 962ffe8..d4a7940 100755 --- a/parser/EventParser.go +++ b/parser/EventParser.go @@ -5,9 +5,10 @@ import ( "fmt" "time" - "github.com/SDHM/sqlregret/client" - "github.com/SDHM/sqlregret/config" - "github.com/SDHM/sqlregret/lifecycle" + "sqlregret/client" + "sqlregret/config" + "sqlregret/lifecycle" + "github.com/cihub/seelog" ) From 651728f201b4a6ea0aca0b7355845130623d85f7 Mon Sep 17 00:00:00 2001 From: lancewang Date: Tue, 18 Oct 2016 14:35:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fixed=20bug:=20index=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=E7=BA=AA=E5=BD=95=E7=9A=84=E6=98=AF=E7=BB=9D=E5=AF=B9?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=97=B6=E7=9A=84=E8=B7=AF=E5=BE=84=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/FileBinlogReader.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/FileBinlogReader.go b/client/FileBinlogReader.go index cc41520..b3afc4b 100644 --- a/client/FileBinlogReader.go +++ b/client/FileBinlogReader.go @@ -75,7 +75,9 @@ func (this *FileBinlogReader) Dump(position uint32, filename string) error { if line, _, err := reader.ReadLine(); nil != err { break } else { - logFile := strings.Split(string(line), "/")[1] + lastSepPos := strings.LastIndex(string(line), "/") + logFile := string(line[lastSepPos+1:]) + fmt.Println(logFile) if logFile == filename { this.index = index }