feat(search): remove userid from indexspace methods

Signed-off-by: jkoberg <jkoberg@owncloud.com>
owncloud · Jun 24, 2024 · b83c358 · b83c358
1 parent b1f1faf
commit b83c358
Show file tree

Hide file tree

Showing 8 changed files with 113 additions and 130 deletions.
diff --git a/services/search/pkg/query/kql/dictionary_gen.go b/services/search/pkg/query/kql/dictionary_gen.go
diff --git a/services/search/pkg/search/debouncer.go b/services/search/pkg/search/debouncer.go
@@ -4,22 +4,21 @@ import (
 	"sync"
 	"time"
 
-	user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
 	provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
 )
 
 // SpaceDebouncer debounces operations on spaces for a configurable amount of time
 type SpaceDebouncer struct {
 	after      time.Duration
-	f          func(id *provider.StorageSpaceId, userID *user.UserId)
+	f          func(id *provider.StorageSpaceId)
 	pending    map[string]*time.Timer
 	inProgress sync.Map
 
 	mutex sync.Mutex
 }
 
 // NewSpaceDebouncer returns a new SpaceDebouncer instance
-func NewSpaceDebouncer(d time.Duration, f func(id *provider.StorageSpaceId, userID *user.UserId)) *SpaceDebouncer {
+func NewSpaceDebouncer(d time.Duration, f func(id *provider.StorageSpaceId)) *SpaceDebouncer {
 	return &SpaceDebouncer{
 		after:      d,
 		f:          f,
@@ -29,7 +28,7 @@ func NewSpaceDebouncer(d time.Duration, f func(id *provider.StorageSpaceId, user
 }
 
 // Debounce restars the debounce timer for the given space
-func (d *SpaceDebouncer) Debounce(id *provider.StorageSpaceId, userID *user.UserId) {
+func (d *SpaceDebouncer) Debounce(id *provider.StorageSpaceId) {
 	d.mutex.Lock()
 	defer d.mutex.Unlock()
 
@@ -48,6 +47,6 @@ func (d *SpaceDebouncer) Debounce(id *provider.StorageSpaceId, userID *user.User
 
 		d.inProgress.Store(id.OpaqueId, true)
 		defer d.inProgress.Delete(id.OpaqueId)
-		d.f(id, userID)
+		d.f(id)
 	})
 }
diff --git a/services/search/pkg/search/debouncer_test.go b/services/search/pkg/search/debouncer_test.go
@@ -4,7 +4,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
 	sprovider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -17,57 +16,54 @@ var _ = Describe("SpaceDebouncer", func() {
 
 		callCount atomic.Int32
 
-		userId = &user.UserId{
-			OpaqueId: "user",
-		}
 		spaceid = &sprovider.StorageSpaceId{
 			OpaqueId: "spaceid",
 		}
 	)
 
 	BeforeEach(func() {
 		callCount = atomic.Int32{}
-		debouncer = search.NewSpaceDebouncer(50*time.Millisecond, func(id *sprovider.StorageSpaceId, _ *user.UserId) {
+		debouncer = search.NewSpaceDebouncer(50*time.Millisecond, func(id *sprovider.StorageSpaceId) {
 			if id.OpaqueId == "spaceid" {
 				callCount.Add(1)
 			}
 		})
 	})
 
 	It("debounces", func() {
-		debouncer.Debounce(spaceid, userId)
-		debouncer.Debounce(spaceid, userId)
-		debouncer.Debounce(spaceid, userId)
+		debouncer.Debounce(spaceid)
+		debouncer.Debounce(spaceid)
+		debouncer.Debounce(spaceid)
 		Eventually(func() int {
 			return int(callCount.Load())
 		}, "200ms").Should(Equal(1))
 	})
 
 	It("works multiple times", func() {
-		debouncer.Debounce(spaceid, userId)
-		debouncer.Debounce(spaceid, userId)
-		debouncer.Debounce(spaceid, userId)
+		debouncer.Debounce(spaceid)
+		debouncer.Debounce(spaceid)
+		debouncer.Debounce(spaceid)
 		time.Sleep(100 * time.Millisecond)
 
-		debouncer.Debounce(spaceid, userId)
-		debouncer.Debounce(spaceid, userId)
+		debouncer.Debounce(spaceid)
+		debouncer.Debounce(spaceid)
 
 		Eventually(func() int {
 			return int(callCount.Load())
 		}, "200ms").Should(Equal(2))
 	})
 
 	It("doesn't trigger twice simultaneously", func() {
-		debouncer = search.NewSpaceDebouncer(50*time.Millisecond, func(id *sprovider.StorageSpaceId, _ *user.UserId) {
+		debouncer = search.NewSpaceDebouncer(50*time.Millisecond, func(id *sprovider.StorageSpaceId) {
 			if id.OpaqueId == "spaceid" {
 				callCount.Add(1)
 			}
 			time.Sleep(300 * time.Millisecond)
 		})
-		debouncer.Debounce(spaceid, userId)
+		debouncer.Debounce(spaceid)
 		time.Sleep(100 * time.Millisecond) // Let it trigger once
 
-		debouncer.Debounce(spaceid, userId)
+		debouncer.Debounce(spaceid)
 		time.Sleep(100 * time.Millisecond) // shouldn't trigger as the other run is still in progress
 		Expect(int(callCount.Load())).To(Equal(1))
 

diff --git a/services/search/pkg/search/events.go b/services/search/pkg/search/events.go
@@ -3,7 +3,6 @@ package search
 import (
 	"time"
 
-	user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
 	provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
 	"github.com/cs3org/reva/v2/pkg/events"
 	"github.com/cs3org/reva/v2/pkg/storagespace"
@@ -52,21 +51,9 @@ func HandleEvents(s Searcher, bus events.Consumer, logger log.Logger, cfg *confi
 		}
 	}
 
-	getUser := func(users ...*user.UserId) *user.UserId {
-		for _, u := range users {
-			if u == nil {
-				continue
-			}
-
-			return u
-		}
-
-		return nil
-	}
-
-	indexSpaceDebouncer := NewSpaceDebouncer(time.Duration(cfg.Events.DebounceDuration)*time.Millisecond, func(id *provider.StorageSpaceId, userID *user.UserId) {
-		if err := s.IndexSpace(id, userID); err != nil {
-			logger.Error().Err(err).Interface("spaceID", id).Interface("userID", userID).Msg("error while indexing a space")
+	indexSpaceDebouncer := NewSpaceDebouncer(time.Duration(cfg.Events.DebounceDuration)*time.Millisecond, func(id *provider.StorageSpaceId) {
+		if err := s.IndexSpace(id); err != nil {
+			logger.Error().Err(err).Interface("spaceID", id).Msg("error while indexing a space")
 		}
 	})
 
@@ -77,41 +64,32 @@ func HandleEvents(s Searcher, bus events.Consumer, logger log.Logger, cfg *confi
 				go func() {
 					logger.Debug().Interface("event", e).Msg("updating index")
 
-					var err error
-
 					switch ev := e.Event.(type) {
 					case events.ItemTrashed:
-						u := getUser(ev.SpaceOwner, ev.Executant)
 						s.TrashItem(ev.ID)
-						indexSpaceDebouncer.Debounce(getSpaceID(ev.Ref), u)
+						indexSpaceDebouncer.Debounce(getSpaceID(ev.Ref))
 					case events.ItemMoved:
-						u := getUser(ev.SpaceOwner, ev.Executant)
-						s.MoveItem(ev.Ref, u)
-						indexSpaceDebouncer.Debounce(getSpaceID(ev.Ref), getUser(ev.SpaceOwner, ev.Executant))
+						s.MoveItem(ev.Ref)
+						indexSpaceDebouncer.Debounce(getSpaceID(ev.Ref))
 					case events.ItemRestored:
-						u := getUser(ev.SpaceOwner, ev.Executant)
-						s.RestoreItem(ev.Ref, u)
-						indexSpaceDebouncer.Debounce(getSpaceID(ev.Ref), u)
+						s.RestoreItem(ev.Ref)
+						indexSpaceDebouncer.Debounce(getSpaceID(ev.Ref))
 					case events.ContainerCreated:
-						indexSpaceDebouncer.Debounce(getSpaceID(ev.Ref), getUser(ev.SpaceOwner, ev.Executant))
+						indexSpaceDebouncer.Debounce(getSpaceID(ev.Ref))
 					case events.FileTouched:
-						indexSpaceDebouncer.Debounce(getSpaceID(ev.Ref), getUser(ev.SpaceOwner, ev.Executant))
+						indexSpaceDebouncer.Debounce(getSpaceID(ev.Ref))
 					case events.FileVersionRestored:
-						indexSpaceDebouncer.Debounce(getSpaceID(ev.Ref), getUser(ev.SpaceOwner, ev.Executant))
+						indexSpaceDebouncer.Debounce(getSpaceID(ev.Ref))
 					case events.TagsAdded:
-						s.UpsertItem(ev.Ref, ev.Executant)
+						s.UpsertItem(ev.Ref)
 					case events.TagsRemoved:
-						s.UpsertItem(ev.Ref, ev.Executant)
+						s.UpsertItem(ev.Ref)
 					case events.FileUploaded:
-						indexSpaceDebouncer.Debounce(getSpaceID(ev.Ref), getUser(ev.SpaceOwner, ev.Executant))
+						indexSpaceDebouncer.Debounce(getSpaceID(ev.Ref))
 					case events.UploadReady:
-						indexSpaceDebouncer.Debounce(getSpaceID(ev.FileRef), getUser(ev.SpaceOwner, ev.ExecutingUser.GetId()))
+						indexSpaceDebouncer.Debounce(getSpaceID(ev.FileRef))
 					case events.SpaceRenamed:
-						indexSpaceDebouncer.Debounce(ev.ID, getUser(ev.Executant))
-					}
-
-					if err != nil {
-						logger.Error().Err(err).Interface("event", e)
+						indexSpaceDebouncer.Debounce(ev.ID)
 					}
 				}()
 			}