Skip to content

Commit

Permalink
Merge pull request #39 from vimeo/go1.20_single_lru_impl
Browse files Browse the repository at this point in the history
lru: consolidate LRU for go 1.20+
  • Loading branch information
dfinkel authored Feb 2, 2023
2 parents 3fc36a9 + c1663ec commit 6de18ea
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
matrix:
os: [macOS-latest, ubuntu-latest]
goversion: [1.17, 1.18, '1.19']
goversion: [1.17, 1.18, '1.19', '1.20']
steps:
- name: Set up Go ${{matrix.goversion}} on ${{matrix.os}}
uses: actions/setup-go@v3
Expand All @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@v1

- name: gofmt
if: ${{matrix.goversion == '1.19'}}
if: ${{matrix.goversion == '1.20'}}
run: |
[[ -z $(gofmt -l $(find . -name '*.go') ) ]]
Expand All @@ -43,9 +43,9 @@ jobs:
GO111MODULE: on
run: go test -race -mod=readonly -count 2 ./...

# Run all consistenthash Fuzz tests for 30s with go 1.19
# Run all consistenthash Fuzz tests for 30s with go 1.20
- name: Fuzz Consistent-Hash
if: ${{matrix.goversion == '1.19'}}
if: ${{matrix.goversion == '1.20'}}
env:
GO111MODULE: on
run: go test -fuzz=. -fuzztime=30s ./consistenthash
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/vimeo/galaxycache

go 1.18
go 1.20

require (
github.com/golang/protobuf v1.4.3
Expand Down
2 changes: 2 additions & 0 deletions lru/lru.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//go:build !go1.20

/*
Copyright 2013 Google Inc.
Expand Down
34 changes: 34 additions & 0 deletions lru/lru_go120.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
//go:build go1.20

/*
Copyright 2023 Vimeo Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

// Package lru implements an LRU cache.
package lru

// A Key may be any value that is comparable. See http://golang.org/ref/spec#Comparison_operators
type Key interface{}

// Cache is an LRU cache. It is not safe for concurrent access.
// This is a compatibility alias for TypedCache[Key,any]
type Cache = TypedCache[Key, any]

// New creates a new Cache.
// If maxEntries is zero, the cache has no limit and it's assumed
// that eviction is done by the caller.
func New(maxEntries int) *Cache {
return TypedNew[Key, any](maxEntries)
}

0 comments on commit 6de18ea

Please sign in to comment.