re
/
redis
forked from mirror/redis
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #98 from go-redis/fix/rm-deprecated-funs 

Remove deprecated funcs.
This commit is contained in:
Vladimir Mihailenco 2015-05-05 11:51:43 +03:00
parent f7a1636422 121cfc5792
commit 3714e407e0
9 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster.go
View File

@ -81,7 +81,7 @@ func (c *ClusterClient) getClient(addr string) (*Client, error) {
if !ok { if !ok {
opt := c.opt.clientOptions() opt := c.opt.clientOptions()
opt.Addr = addr opt.Addr = addr
client = NewTCPClient(opt) client = NewClient(opt)
c.clients[addr] = client c.clients[addr] = client
} }
c.clientsMx.Unlock() c.clientsMx.Unlock()

2
command_test.go
View File

@ -15,7 +15,7 @@ var _ = Describe("Command", func() {
var client *redis.Client var client *redis.Client
BeforeEach(func() { BeforeEach(func() {
client = redis.NewTCPClient(&redis.Options{ client = redis.NewClient(&redis.Options{
Addr: redisAddr, Addr: redisAddr,
}) })
}) })

2
commands_test.go
View File

@ -16,7 +16,7 @@ var _ = Describe("Commands", func() {
var client *redis.Client var client *redis.Client
BeforeEach(func() { BeforeEach(func() {
client = redis.NewTCPClient(&redis.Options{ client = redis.NewClient(&redis.Options{
Addr: redisAddr, Addr: redisAddr,
PoolTimeout: 30 * time.Second, PoolTimeout: 30 * time.Second,
}) })

6
example_test.go
View File

@ -10,14 +10,14 @@ import (
var client *redis.Client var client *redis.Client
func init() { func init() {
client = redis.NewTCPClient(&redis.Options{ client = redis.NewClient(&redis.Options{
Addr: ":6379", Addr: ":6379",
}) })
client.FlushDb() client.FlushDb()
} }
func ExampleNewTCPClient() { func ExampleNewClient() {
client := redis.NewTCPClient(&redis.Options{ client := redis.NewClient(&redis.Options{
Addr: "localhost:6379", Addr: "localhost:6379",
Password: "", // no password set Password: "", // no password set
DB: 0, // use default DB DB: 0, // use default DB

2
multi_test.go
View File

@ -11,7 +11,7 @@ var _ = Describe("Multi", func() {
var client *redis.Client var client *redis.Client
BeforeEach(func() { BeforeEach(func() {
client = redis.NewTCPClient(&redis.Options{ client = redis.NewClient(&redis.Options{
Addr: redisAddr, Addr: redisAddr,
}) })
}) })

2
pipeline_test.go
View File

@ -14,7 +14,7 @@ var _ = Describe("Pipelining", func() {
var client *redis.Client var client *redis.Client
BeforeEach(func() { BeforeEach(func() {
client = redis.NewTCPClient(&redis.Options{ client = redis.NewClient(&redis.Options{
Addr: redisAddr, Addr: redisAddr,
}) })
}) })

2
pubsub_test.go
View File

@ -14,7 +14,7 @@ var _ = Describe("PubSub", func() {
var client *redis.Client var client *redis.Client
BeforeEach(func() { BeforeEach(func() {
client = redis.NewTCPClient(&redis.Options{ client = redis.NewClient(&redis.Options{
Addr: redisAddr, Addr: redisAddr,
}) })
}) })

12
redis.go
View File

@ -188,15 +188,3 @@ func NewClient(clOpt *Options) *Client {
} }
return newClient(opt, newConnPool(newConnFunc(dialer), opt)) return newClient(opt, newConnPool(newConnFunc(dialer), opt))
} }
// Deprecated. Use NewClient instead.
func NewTCPClient(opt *Options) *Client {
opt.Network = "tcp"
return NewClient(opt)
}
// Deprecated. Use NewClient instead.
func NewUnixClient(opt *Options) *Client {
opt.Network = "unix"
return NewClient(opt)
}

6
redis_test.go
View File

@ -28,7 +28,7 @@ var _ = Describe("Client", func() {
var client *redis.Client var client *redis.Client
BeforeEach(func() { BeforeEach(func() {
client = redis.NewTCPClient(&redis.Options{ client = redis.NewClient(&redis.Options{
Addr: redisAddr, Addr: redisAddr,
}) })
}) })
@ -98,7 +98,7 @@ var _ = Describe("Client", func() {
}) })
It("should support idle-timeouts", func() { It("should support idle-timeouts", func() {
idle := redis.NewTCPClient(&redis.Options{ idle := redis.NewClient(&redis.Options{
Addr: redisAddr, Addr: redisAddr,
IdleTimeout: 100 * time.Microsecond, IdleTimeout: 100 * time.Microsecond,
}) })
@ -110,7 +110,7 @@ var _ = Describe("Client", func() {
}) })
It("should support DB selection", func() { It("should support DB selection", func() {
db1 := redis.NewTCPClient(&redis.Options{ db1 := redis.NewClient(&redis.Options{
Addr: redisAddr, Addr: redisAddr,
DB: 1, DB: 1,
}) })