src: simplified firestore implementation, added limit arg

remorses · Jun 11, 2020 · 1954852 · 1954852
1 parent df196be
commit 1954852
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/src/database_interface.go b/src/database_interface.go
@@ -104,6 +104,7 @@ type UpdateParams struct {
 type DeleteManyParams struct {
 	Collection string
 	Where      WhereTree //  `mapstructure:"where"`
+	Limit      int
 }
 
 type Pagination struct {

diff --git a/src/fakedata/fakedata.go b/src/fakedata/fakedata.go
@@ -3,6 +3,7 @@ package fakedata
 import (
 	"context"
 	"fmt"
+	"math"
 	"time"
 
 	"github.com/256dpi/lungo"
@@ -187,6 +188,9 @@ func (self *FakeDatabaseFunctions) UpdateMany(ctx context.Context, p goke.Update
 }
 
 func (self *FakeDatabaseFunctions) DeleteMany(ctx context.Context, p goke.DeleteManyParams, hook goke.TransformDocument) (goke.NodesMutationPayload, error) {
+	if p.Limit == 0 {
+		p.Limit = math.MaxInt16
+	}
 	db, err := self.Init(ctx)
 	payload := goke.NodesMutationPayload{}
 	if err != nil {
@@ -196,7 +200,7 @@ func (self *FakeDatabaseFunctions) DeleteMany(ctx context.Context, p goke.Delete
 	testutil.PrettyPrint(p)
 
 	// find accessible nodes
-	nodes, err := self.FindMany(ctx, goke.FindManyParams{Collection: p.Collection, Where: p.Where}, hook)
+	nodes, err := self.FindMany(ctx, goke.FindManyParams{Collection: p.Collection, Where: p.Where, Limit: p.Limit}, hook)
 	if err != nil {
 		return payload, err
 	}

diff --git a/src/firestore/firestore.go b/src/firestore/firestore.go
@@ -171,10 +171,9 @@ func (self *FirestoreDatabaseFunctions) updateMany(ctx context.Context, p goke.U
 }
 
 func (self *FirestoreDatabaseFunctions) DeleteMany(ctx context.Context, p goke.DeleteManyParams, hook goke.TransformDocument) (goke.NodesMutationPayload, error) {
-	return self.deleteMany(ctx, p, hook, math.MaxInt32)
-}
-
-func (self *FirestoreDatabaseFunctions) deleteMany(ctx context.Context, p goke.DeleteManyParams, hook goke.TransformDocument, count int) (goke.NodesMutationPayload, error) {
+	if p.Limit == 0 {
+		p.Limit = math.MaxInt16
+	}
 	db, err := self.Init(ctx)
 	payload := goke.NodesMutationPayload{}
 	if err != nil {
@@ -190,7 +189,7 @@ func (self *FirestoreDatabaseFunctions) deleteMany(ctx context.Context, p goke.D
 	iter := query.Documents(ctx)
 	defer iter.Stop()
 	// TODO use batching for firestore's updateMany
-	for payload.AffectedCount < count {
+	for payload.AffectedCount < p.Limit {
 		doc, err := iter.Next()
 		if err == iterator.Done {
 			break

diff --git a/src/mongodb/mongodb.go b/src/mongodb/mongodb.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"math"
 	"time"
 
 	goke "github.com/remorses/goke/src"
@@ -187,6 +188,9 @@ func (self *MongodbDatabaseFunctions) UpdateMany(ctx context.Context, p goke.Upd
 }
 
 func (self *MongodbDatabaseFunctions) DeleteMany(ctx context.Context, p goke.DeleteManyParams, hook goke.TransformDocument) (goke.NodesMutationPayload, error) {
+	if p.Limit == 0 {
+		p.Limit = math.MaxInt16
+	}
 	db, err := self.Init(ctx)
 	payload := goke.NodesMutationPayload{}
 	if err != nil {
@@ -196,7 +200,7 @@ func (self *MongodbDatabaseFunctions) DeleteMany(ctx context.Context, p goke.Del
 	testutil.PrettyPrint(p)
 
 	// find accessible nodes
-	nodes, err := self.FindMany(ctx, goke.FindManyParams{Collection: p.Collection, Where: p.Where}, hook)
+	nodes, err := self.FindMany(ctx, goke.FindManyParams{Collection: p.Collection, Where: p.Where, Limit: p.Limit}, hook)
 	if err != nil {
 		return payload, err
 	}