Skip to content
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.

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

*: change standard "context" package to "golang.org/x/net/context" #2890

Merged
merged 4 commits into from
Mar 20, 2017

Conversation

tiancaiamao
Copy link
Contributor

store/tikv should not use both "context" and "golang.org/x/net/context"

"io"
"io/ioutil"
"time"

goctx "golang.org/x/net/context"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this empty line.

"errors"
"io"
"io/ioutil"
"runtime"
"testing"
"time"

goctx "golang.org/x/net/context"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this empty line.

@@ -16,11 +16,11 @@
package tikv

import (
"context"
mocktikv "github.com/pingcap/tidb/store/tikv/mock-tikv"
goctx "golang.org/x/net/context"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the empty line.

@@ -14,7 +14,7 @@
package tikv

import (
"context"
goctx "golang.org/x/net/context"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the empty line.

"sync"

goctx "golang.org/x/net/context"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the empty line.

"sync"
"time"

goctx "golang.org/x/net/context"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the empty line.

@siddontang
Copy link
Member

I think we must convert all standard context to golang context now. It is very strange that we use two similar context packages in one project and this it a risk to combine using them together.

@coocood
Copy link
Member

coocood commented Mar 20, 2017

LGTM

@coocood coocood added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 20, 2017
@siddontang
Copy link
Member

LGTM

We can add go 1.6 in travis CI to avoid using wrong context.

@coocood coocood added the status/LGT2 Indicates that a PR has LGTM 2. label Mar 20, 2017
@coocood coocood merged commit 294334f into master Mar 20, 2017
@coocood coocood deleted the tiancaiamao/context-rename branch March 20, 2017 05:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status/LGT1 Indicates that a PR has LGTM 1. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants