Skip to content

改进index文件中保存绝对路径时解析的问题。 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
beihai23 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

改进index文件中保存绝对路径时解析的问题。 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fce8ab3
针对自己的工作路径修改代码中的包路径
Oct 18, 2016
651728f
fixed bug: index文件中纪录的是绝对路径时的路径处理错误
Oct 18, 2016
a995098
Merge branch 'master' of https://github.com/SDHM/sqlregret
Feb 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions client/FileBinlogReader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions client/FormatDescriptionLogEvent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"strconv"
"strings"

. "github.com/SDHM/sqlregret/binlogevent"
"github.com/SDHM/sqlregret/mysql"
. "sqlregret/binlogevent"
"sqlregret/mysql"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion client/IBinlogReader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package client

import (
. "github.com/SDHM/sqlregret/mysql"
. "sqlregret/mysql"
)

type IBinlogReader interface {
Expand Down
2 changes: 1 addition & 1 deletion client/LogHeader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package client

import (
"github.com/SDHM/sqlregret/mysql"
"sqlregret/mysql"
)

type LogHeader struct {
Expand Down
9 changes: 5 additions & 4 deletions client/LogParser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
5 changes: 3 additions & 2 deletions client/NetBinlogReader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions client/QueryLogEvent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package client

import (
. "github.com/SDHM/sqlregret/binlogevent"
"github.com/SDHM/sqlregret/mysql"
. "sqlregret/binlogevent"
"sqlregret/mysql"
)

type QueryLogEvent struct {
Expand Down
2 changes: 1 addition & 1 deletion client/RotateLogEvent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package client

import (
"github.com/SDHM/sqlregret/mysql"
"sqlregret/mysql"
)

type RotateLogEvent struct {
Expand Down
2 changes: 1 addition & 1 deletion client/RowsQueryEvent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package client

import "github.com/SDHM/sqlregret/mysql"
import "sqlregret/mysql"

type RowsQueryEvent struct {
queryString string
Expand Down
6 changes: 3 additions & 3 deletions client/SkipParse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 表示过滤
Expand Down
2 changes: 1 addition & 1 deletion client/TableMapLogEvent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package client

import . "github.com/SDHM/sqlregret/mysql"
import . "sqlregret/mysql"

type Column struct {
ColumnType byte
Expand Down
2 changes: 1 addition & 1 deletion client/TableMetaCache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package client

import (
"github.com/SDHM/sqlregret/mysql"
"sqlregret/mysql"
)

type TableMetaCache struct {
Expand Down
2 changes: 1 addition & 1 deletion client/Transaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package client
import (
"fmt"

"github.com/SDHM/sqlregret/config"
"sqlregret/config"
)

//收集事务消息
Expand Down
5 changes: 3 additions & 2 deletions client/previous_gtids_event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions instance/Instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"runtime"
"sync"

"github.com/SDHM/sqlregret/config"
"github.com/SDHM/sqlregret/parser"
"sqlregret/config"
"sqlregret/parser"
)

type Instance struct {
Expand Down
5 changes: 3 additions & 2 deletions main/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions main/sqlregret.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"masterPort" : 3306,
"masterAddress" : "127.0.0.1",
"slaveId" : 5,
"dbPassword" : "123456",
"defaultDbName" : "app",
"dbUsername" : "reader"
"dbPassword" : "",
"defaultDbName" : "test",
"dbUsername" : "root"
}
7 changes: 4 additions & 3 deletions parser/EventParser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down