Skip to content

Commit

Permalink
Merge pull request #36 from exuan/bump-go-redis-to-v9
Browse files Browse the repository at this point in the history
chore(deps): bump go-redis v8 to v9
  • Loading branch information
yangbodong22011 authored Jul 8, 2024
2 parents 3999a24 + 61d599e commit 138b497
Show file tree
Hide file tree
Showing 48 changed files with 122 additions and 119 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:

test-ubuntu-with-redis-62:
test-ubuntu-with-redis-7:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -17,7 +17,7 @@ jobs:
sudo apt-get install git
git clone https://github.com/redis/redis
cd redis
git checkout 6.2.0
git checkout 7.2.5
make -j
- name: clone and make tairhash
Expand Down Expand Up @@ -76,8 +76,8 @@ jobs:

- name: Test
run: |
go test -v ./... -run TestTairStringTestSuite/TestTairStringTestSuite
go test -v ./... -run TestTairStringTestSuite/TestTairHashTestSuite
go test -v ./... -run TestTairStringTestSuite/TestTairZsetTestSuite
go test -v ./... -run TestTairStringTestSuite
go test -v ./... -run TestTairHashTestSuite
go test -v ./... -run TestTairZsetTestSuite
go test -v ./... -run TestTairPipelineTestSuite
2 changes: 1 addition & 1 deletion README-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ test.go
import (
"context"
"fmt"
"github.com/go-redis/redis/v8"
"github.com/redis/go-redis/v9"
"github.com/alibaba/tair-go/tair"
)

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ test.go
import (
"context"
"fmt"
"github.com/go-redis/redis/v8"
"github.com/redis/go-redis/v9"
"github.com/alibaba/tair-go/tair"
)

Expand Down
3 changes: 2 additions & 1 deletion example/BargainRush/BargainRush.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package main
import (
"context"
"fmt"

"github.com/alibaba/tair-go/tair"
"github.com/go-redis/redis/v8"
"github.com/redis/go-redis/v9"
)

var ctx = context.Background()
Expand Down
3 changes: 2 additions & 1 deletion example/BitCount/BitCount.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package main
import (
"context"
"fmt"

"github.com/alibaba/tair-go/tair"
"github.com/go-redis/redis/v8"
"github.com/redis/go-redis/v9"
)

var ctx = context.Background()
Expand Down
5 changes: 3 additions & 2 deletions example/BloomFilter/BloomFilter.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ package main

import (
"context"
"github.com/alibaba/tair-go/tair"
"github.com/go-redis/redis/v8"
"math/rand"
"time"

"github.com/alibaba/tair-go/tair"
"github.com/redis/go-redis/v9"
)

var ctx = context.Background()
Expand Down
3 changes: 2 additions & 1 deletion example/BoundedCounter/BoundedCounter.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package main
import (
"context"
"fmt"

"github.com/alibaba/tair-go/tair"
"github.com/go-redis/redis/v8"
"github.com/redis/go-redis/v9"
)

var ctx = context.Background()
Expand Down
5 changes: 3 additions & 2 deletions example/CarTrack/CarTrack.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ package main
import (
"context"
"fmt"
"github.com/alibaba/tair-go/tair"
"github.com/go-redis/redis/v8"
"strconv"
"time"

"github.com/alibaba/tair-go/tair"
"github.com/redis/go-redis/v9"
)

var ctx = context.Background()
Expand Down
3 changes: 2 additions & 1 deletion example/CpuCurve/CpuCurve.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ package main

import (
"context"

"github.com/alibaba/tair-go/tair"
"github.com/go-redis/redis/v8"
"github.com/redis/go-redis/v9"
)

var ctx = context.Background()
Expand Down
3 changes: 2 additions & 1 deletion example/CrawlerSystem/CrawlerSystem.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package main
import (
"context"
"fmt"

"github.com/alibaba/tair-go/tair"
"github.com/go-redis/redis/v8"
"github.com/redis/go-redis/v9"
)

var ctx = context.Background()
Expand Down
5 changes: 3 additions & 2 deletions example/DeviceLogin/DeviceLogin.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ package main
import (
"context"
"fmt"
"github.com/alibaba/tair-go/tair"
"github.com/go-redis/redis/v8"
"strconv"
"time"

"github.com/alibaba/tair-go/tair"
"github.com/redis/go-redis/v9"
)

var ctx = context.Background()
Expand Down
3 changes: 2 additions & 1 deletion example/FraudPrevention/FraudPrevention.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package main
import (
"context"
"fmt"

"github.com/alibaba/tair-go/tair"
"github.com/go-redis/redis/v8"
"github.com/redis/go-redis/v9"
)

var ctx = context.Background()
Expand Down
3 changes: 2 additions & 1 deletion example/FullTextSearch/FullTextSearch.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package main
import (
"context"
"fmt"

"github.com/alibaba/tair-go/tair"
"github.com/go-redis/redis/v8"
"github.com/redis/go-redis/v9"
)

var ctx = context.Background()
Expand Down
3 changes: 2 additions & 1 deletion example/GamePackage/GamePackage.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package main
import (
"context"
"fmt"

"github.com/alibaba/tair-go/tair"
"github.com/go-redis/redis/v8"
"github.com/redis/go-redis/v9"
)

var ctx = context.Background()
Expand Down
3 changes: 2 additions & 1 deletion example/JSONDocument/JSONDocument.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package main
import (
"context"
"fmt"

"github.com/alibaba/tair-go/tair"
"github.com/go-redis/redis/v8"
"github.com/redis/go-redis/v9"
)

var ctx = context.Background()
Expand Down
3 changes: 2 additions & 1 deletion example/LbsBuy/LbsBuy.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package main
import (
"context"
"fmt"

"github.com/alibaba/tair-go/tair"
"github.com/go-redis/redis/v8"
"github.com/redis/go-redis/v9"
)

var ctx = context.Background()
Expand Down
2 changes: 1 addition & 1 deletion example/LeaderBoard/LeaderBoard.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"

"github.com/alibaba/tair-go/tair"
"github.com/go-redis/redis/v8"
"github.com/redis/go-redis/v9"
)

var ctx = context.Background()
Expand Down
3 changes: 2 additions & 1 deletion example/MultiIndexSearch/MultiIndexSearch.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package main
import (
"context"
"fmt"

"github.com/alibaba/tair-go/tair"
"github.com/go-redis/redis/v8"
"github.com/redis/go-redis/v9"
)

var ctx = context.Background()
Expand Down
5 changes: 3 additions & 2 deletions example/PasswordExpire/PasswordExpire.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package main
import (
"context"
"fmt"
"github.com/alibaba/tair-go/tair"
"github.com/go-redis/redis/v8"
"time"

"github.com/alibaba/tair-go/tair"
"github.com/redis/go-redis/v9"
)

var ctx = context.Background()
Expand Down
3 changes: 2 additions & 1 deletion example/example.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package main
import (
"context"
"fmt"

"github.com/alibaba/tair-go/tair"
"github.com/go-redis/redis/v8"
"github.com/redis/go-redis/v9"
)

var ctx = context.Background()
Expand Down
5 changes: 3 additions & 2 deletions example/taircluster/example_taircluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package main
import (
"context"
"fmt"
"github.com/alibaba/tair-go/tair"
"github.com/go-redis/redis/v8"
"reflect"

"github.com/alibaba/tair-go/tair"
"github.com/redis/go-redis/v9"
)

var ctx = context.Background()
Expand Down
2 changes: 1 addition & 1 deletion example/tairhash/example_hash.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"

"github.com/alibaba/tair-go/tair"
"github.com/go-redis/redis/v8"
"github.com/redis/go-redis/v9"
)

var ctx = context.Background()
Expand Down
5 changes: 3 additions & 2 deletions example/tairstring/distribute_lock.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ package main
import (
"context"
"fmt"
"github.com/alibaba/tair-go/tair"
"github.com/go-redis/redis/v8"
"math/rand"
"sync"
"time"

"github.com/alibaba/tair-go/tair"
"github.com/redis/go-redis/v9"
)

var ctx = context.Background()
Expand Down
2 changes: 1 addition & 1 deletion example/tairvector/example_vector.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/json"
"fmt"
"github.com/alibaba/tair-go/tair"
"github.com/go-redis/redis/v8"
"github.com/redis/go-redis/v9"
"math/rand"
)

Expand Down
15 changes: 4 additions & 11 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
module github.com/alibaba/tair-go

go 1.17
go 1.18

require (
github.com/go-redis/redis/v8 v8.11.5
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.18.1
github.com/stretchr/testify v1.8.0
github.com/redis/go-redis/v9 v9.5.3
github.com/stretchr/testify v1.9.0
)

require (
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
golang.org/x/text v0.3.7 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 138b497

Please sign in to comment.