Skip to content

Commit

Permalink
resolve conflicts
Browse files Browse the repository at this point in the history
Signed-off-by: Neil Shen <overvenus@gmail.com>
  • Loading branch information
overvenus committed Dec 17, 2021
1 parent 846d4fa commit 98487d0
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 264 deletions.
28 changes: 0 additions & 28 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,9 @@ linters:
enable:
- unconvert
- unparam
<<<<<<< HEAD
=======
- revive
- depguard

linters-settings:
revive:
ignore-generated-header: false
severity: error
confidence: 0.8
error-code: -1
warning-code: -1
rules:
- name: blank-imports
- name: context-as-argument
- name: dot-imports
- name: error-return
- name: error-strings
- name: error-naming
- name: exported
- name: if-return
- name: var-naming
- name: package-comments
- name: range
- name: receiver-naming
- name: indent-error-flow
- name: superfluous-else
- name: modifies-parameter
- name: unreachable-code

depguard:
list-type: blacklist
include-go-root: false
Expand All @@ -42,4 +15,3 @@ linters-settings:
# specify an error message to output when a blacklisted package is used
- log: "logging is allowed only by pingcap/log"
- github.com/juju/errors: "error handling is allowed only by pingcap/errors"
>>>>>>> 2ed02366d (pkg,cdc: do not use log package (#3902))
2 changes: 1 addition & 1 deletion cdc/processor/pipeline/mounter.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ package pipeline

import (
"context"
"log"
"sync"
"time"

"github.com/edwingeng/deque"
"github.com/pingcap/failpoint"
"github.com/pingcap/log"
"github.com/pingcap/ticdc/cdc/model"
"github.com/pingcap/ticdc/pkg/notify"
"github.com/pingcap/ticdc/pkg/pipeline"
Expand Down
211 changes: 0 additions & 211 deletions cdc/scheduler/util/table_set.go

This file was deleted.

5 changes: 1 addition & 4 deletions cdc/sink/codec/canal.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,10 @@ import (

"github.com/golang/protobuf/proto" // nolint:staticcheck
"github.com/pingcap/errors"
<<<<<<< HEAD
"github.com/pingcap/log"
mm "github.com/pingcap/parser/model"
"github.com/pingcap/parser/mysql"
parser_types "github.com/pingcap/parser/types"
=======
"github.com/pingcap/log"
>>>>>>> 2ed02366d (pkg,cdc: do not use log package (#3902))
"github.com/pingcap/ticdc/cdc/model"
cerror "github.com/pingcap/ticdc/pkg/errors"
canal "github.com/pingcap/ticdc/proto/canal"
Expand Down
9 changes: 1 addition & 8 deletions integration/tests/case_date_time.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,11 @@ import (
"errors"
"time"

<<<<<<< HEAD:integration/tests/case_date_time.go
"github.com/pingcap/log"
"github.com/pingcap/ticdc/integration/framework"
"github.com/pingcap/ticdc/integration/framework/avro"
"github.com/pingcap/ticdc/integration/framework/canal"
"github.com/pingcap/ticdc/integration/framework/mysql"
=======
"github.com/pingcap/log"
"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework"
"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework/avro"
"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework/canal"
"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework/mysql"
>>>>>>> 2ed02366d (pkg,cdc: do not use log package (#3902)):tests/mq_protocol_tests/cases/case_date_time.go
)

// DateTimeCase is base impl of test case for different types data
Expand Down
9 changes: 2 additions & 7 deletions pkg/context/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,12 @@ import (
"context"
"time"

<<<<<<< HEAD
"github.com/pingcap/ticdc/pkg/pdtime"

"github.com/pingcap/ticdc/pkg/version"

=======
"github.com/pingcap/log"
>>>>>>> 2ed02366d (pkg,cdc: do not use log package (#3902))
"github.com/pingcap/ticdc/cdc/kv"
"github.com/pingcap/ticdc/cdc/model"
"github.com/pingcap/ticdc/pkg/config"
"github.com/pingcap/ticdc/pkg/pdtime"
"github.com/pingcap/ticdc/pkg/version"
tidbkv "github.com/pingcap/tidb/kv"
"github.com/tikv/client-go/v2/oracle"
pd "github.com/tikv/pd/client"
Expand Down
6 changes: 1 addition & 5 deletions pkg/context/context_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,7 @@ func (s *contextSuite) TestThrowPanic(c *check.C) {
defer testleak.AfterTest(c)()
defer func() {
panicMsg := recover()
<<<<<<< HEAD
c.Assert(panicMsg, check.Equals, "an error has escaped, please report a bug{error 26 0 mock error}")
=======
require.Equal(t, panicMsg, "an error has escaped, please report a bug")
>>>>>>> 2ed02366d (pkg,cdc: do not use log package (#3902))
c.Assert(panicMsg, check.Equals, "an error has escaped, please report a bug")
}()
stdCtx := context.Background()
ctx := NewContext(stdCtx, &GlobalVars{})
Expand Down

0 comments on commit 98487d0

Please sign in to comment.