POC: $Fork

treeverse · Nov 22, 2024 · 8ff40f2 · 8ff40f2
1 parent b351a64
commit 8ff40f2
Show file tree

Hide file tree

Showing 20 changed files with 1,300 additions and 13 deletions.
diff --git a/go.mod b/go.mod
@@ -23,7 +23,7 @@ require (
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/uuid v1.6.0
 	github.com/hashicorp/go-multierror v1.1.1
-	github.com/hnlq715/golang-lru v0.3.0
+	github.com/hnlq715/golang-lru v0.4.0
 	github.com/jamiealquiza/tachymeter v2.0.0+incompatible
 	github.com/jedib0t/go-pretty/v6 v6.5.9
 	github.com/manifoldco/promptui v0.9.0

diff --git a/go.sum b/go.sum
@@ -652,8 +652,7 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hnlq715/golang-lru v0.3.0 h1:eJtRD3bIw/dxwha16+urdY7bGfoCy/fAM+A/gahvYJM=
-github.com/hnlq715/golang-lru v0.3.0/go.mod h1:RBkgDAtlu0SgTPvpb4VW2/RQnkCBMRD3Lr6B9RhsAS8=
+github.com/hnlq715/golang-lru v0.4.0 h1:gyo/wIvLE6Upf1wucAfwTjpR+BQ5Lli2766H2MnNPv0=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/xstrings v1.3.3 h1:/Gcsuc1x8JVbJ9/rlye4xZnVAbEkGauT8lbebqcQws4=
 github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=

diff --git a/go.work b/go.work
@@ -0,0 +1,6 @@
+go 1.22.7
+
+use (
+	.
+	./modules/cache
+)
diff --git a/go.work.sum b/go.work.sum
diff --git a/pkg/cache/cache.go → modules/cache/cache.go b/pkg/cache/cache.go → modules/cache/cache.go
diff --git a/pkg/cache/cache_test.go → modules/cache/cache_test.go b/pkg/cache/cache_test.go → modules/cache/cache_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/treeverse/lakefs/pkg/cache"
+	"github.com/treeverse/lakefs/modules/cache"
 )
 
 func TestCache(t *testing.T) {

diff --git a/modules/cache/go.mod b/modules/cache/go.mod
@@ -0,0 +1,5 @@
+module github.com/treeverse/lakefs/modules/cache
+
+go 1.22.7
+
+// This module uses the go.work file to get all package dependencies from lakefs
diff --git a/modules/cache/go.work b/modules/cache/go.work
@@ -0,0 +1,6 @@
+go 1.22.7
+
+use (
+	.
+	../../../lakefs
+)
diff --git a/modules/cache/go.work.sum b/modules/cache/go.work.sum
diff --git a/pkg/cache/no_cache.go → modules/cache/no_cache.go b/pkg/cache/no_cache.go → modules/cache/no_cache.go
diff --git a/pkg/cache/only_one.go → modules/cache/only_one.go b/pkg/cache/only_one.go → modules/cache/only_one.go
diff --git a/pkg/cache/only_one_test.go → modules/cache/only_one_test.go b/pkg/cache/only_one_test.go → modules/cache/only_one_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/treeverse/lakefs/pkg/cache"
+	"github.com/treeverse/lakefs/modules/cache"
 	"github.com/treeverse/lakefs/pkg/testutil"
 )
 

diff --git a/pkg/api/serve_test.go b/pkg/api/serve_test.go
@@ -13,6 +13,7 @@ import (
 
 	"github.com/deepmap/oapi-codegen/pkg/securityprovider"
 	"github.com/spf13/viper"
+	"github.com/treeverse/lakefs/modules/cache"
 	"github.com/treeverse/lakefs/pkg/actions"
 	"github.com/treeverse/lakefs/pkg/api"
 	"github.com/treeverse/lakefs/pkg/api/apigen"
@@ -23,7 +24,6 @@ import (
 	authparams "github.com/treeverse/lakefs/pkg/auth/params"
 	"github.com/treeverse/lakefs/pkg/authentication"
 	"github.com/treeverse/lakefs/pkg/block"
-	"github.com/treeverse/lakefs/pkg/cache"
 	"github.com/treeverse/lakefs/pkg/catalog"
 	"github.com/treeverse/lakefs/pkg/config"
 	"github.com/treeverse/lakefs/pkg/graveler/settings"

diff --git a/pkg/auth/cache.go b/pkg/auth/cache.go
@@ -3,8 +3,8 @@ package auth
 import (
 	"time"
 
+	"github.com/treeverse/lakefs/modules/cache"
 	"github.com/treeverse/lakefs/pkg/auth/model"
-	"github.com/treeverse/lakefs/pkg/cache"
 )
 
 type CredentialSetFn func() (*model.Credential, error)

diff --git a/pkg/catalog/actions_source.go b/pkg/catalog/actions_source.go
@@ -6,8 +6,8 @@ import (
 	"io"
 	"time"
 
+	"github.com/treeverse/lakefs/modules/cache"
 	"github.com/treeverse/lakefs/pkg/block"
-	"github.com/treeverse/lakefs/pkg/cache"
 	"github.com/treeverse/lakefs/pkg/graveler"
 )
 

diff --git a/pkg/graveler/branch/protection_manager.go b/pkg/graveler/branch/protection_manager.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/gobwas/glob"
-	"github.com/treeverse/lakefs/pkg/cache"
+	"github.com/treeverse/lakefs/modules/cache"
 	"github.com/treeverse/lakefs/pkg/graveler"
 	"github.com/treeverse/lakefs/pkg/graveler/settings"
 )

diff --git a/pkg/graveler/ref/manager.go b/pkg/graveler/ref/manager.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-multierror"
+	"github.com/treeverse/lakefs/modules/cache"
 	"github.com/treeverse/lakefs/pkg/batch"
-	"github.com/treeverse/lakefs/pkg/cache"
 	"github.com/treeverse/lakefs/pkg/distributed"
 	"github.com/treeverse/lakefs/pkg/graveler"
 	"github.com/treeverse/lakefs/pkg/httputil"

diff --git a/pkg/graveler/settings/manager.go b/pkg/graveler/settings/manager.go
@@ -5,10 +5,10 @@ import (
 	"crypto/sha256"
 	"encoding/hex"
 	"errors"
+	"github.com/treeverse/lakefs/modules/cache"
 	"time"
 
 	"github.com/go-openapi/swag"
-	"github.com/treeverse/lakefs/pkg/cache"
 	"github.com/treeverse/lakefs/pkg/graveler"
 	"github.com/treeverse/lakefs/pkg/kv"
 	"github.com/treeverse/lakefs/pkg/logging"

diff --git a/pkg/graveler/settings/manager_test.go b/pkg/graveler/settings/manager_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/go-test/deep"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
-	"github.com/treeverse/lakefs/pkg/cache"
+	"github.com/treeverse/lakefs/modules/cache"
 	"github.com/treeverse/lakefs/pkg/graveler"
 	"github.com/treeverse/lakefs/pkg/graveler/mock"
 	"github.com/treeverse/lakefs/pkg/graveler/settings"

diff --git a/pkg/pyramid/tier_fs.go b/pkg/pyramid/tier_fs.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 
 	"github.com/google/uuid"
+	"github.com/treeverse/lakefs/modules/cache"
 	"github.com/treeverse/lakefs/pkg/block"
-	"github.com/treeverse/lakefs/pkg/cache"
 	"github.com/treeverse/lakefs/pkg/logging"
 	"github.com/treeverse/lakefs/pkg/pyramid/params"
 )