Skip to content

no appengine #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yoavfeld wants to merge 3 commits into
base: master
Choose a base branch
from
Open

no appengine #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b62c939
no appengine
Nov 8, 2017
cad5742
remove unneeded
Nov 8, 2017
0968de2
finish implement except runInTransaction, start fix unit tests
Feb 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
202 changes: 0 additions & 202 deletions LICENSE
View file
Open in desktop

This file was deleted.

10 changes: 6 additions & 4 deletions delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ import (
"sync"

"golang.org/x/net/context"
"google.golang.org/appengine"
"google.golang.org/appengine/datastore"
"google.golang.org/appengine/memcache"
"cloud.google.com/go/datastore"
"github.com/bradfitz/gomemcache/memcache"
)

// deleteMultiLimit is the App Engine datastore limit for the maximum number
Expand Down Expand Up @@ -47,8 +46,11 @@ func DeleteMulti(c context.Context, keys []*datastore.Key) error {

// Delete deletes the entity for the given key.
func Delete(c context.Context, key *datastore.Key) error {
if key == nil {
return datastore.ErrInvalidKey
}
err := deleteMulti(c, []*datastore.Key{key})
if me, ok := err.(appengine.MultiError); ok {
if me, ok := err.(datastore.MultiError); ok {
return me[0]
}
return err
Expand Down
28 changes: 14 additions & 14 deletions delete_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ import (
"strconv"
"testing"

"github.com/qedus/nds"
"github.com/yoavfeld/nds"

"errors"

"golang.org/x/net/context"
"google.golang.org/appengine"
"google.golang.org/appengine/datastore"
"google.golang.org/appengine/memcache"
"cloud.google.com/go/datastore"
"github.com/bradfitz/gomemcache/memcache"
)

func TestDeleteMulti(t *testing.T) {
Expand All @@ -27,7 +26,7 @@ func TestDeleteMulti(t *testing.T) {
entities := make([]TestEntity, count)

for i := range keys {
keys[i] = datastore.NewKey(c, "TestEntity", strconv.Itoa(i), 0, nil)
keys[i] = datastore.NameKey("TestEntity", strconv.Itoa(i), nil)
entities[i] = TestEntity{i}
}

Expand All @@ -50,7 +49,7 @@ func TestDeleteMulti(t *testing.T) {
t.Fatal("expect error")
}

me, ok := err.(appengine.MultiError)
me, ok := err.(datastore.MultiError)
if !ok {
t.Fatal("should be MultiError")
}
Expand Down Expand Up @@ -89,7 +88,7 @@ func TestDeleteMemcacheFail(t *testing.T) {
Val int
}

key := datastore.NewKey(c, "Entity", "", 1, nil)
key := datastore.IDKey("Entity", 1, nil)
keys := []*datastore.Key{key}
entities := make([]testEntity, 1)
entities[0].Val = 43
Expand All @@ -104,7 +103,7 @@ func TestDeleteMemcacheFail(t *testing.T) {
})

defer func() {
nds.SetMemcacheSetMulti(memcache.SetMulti)
nds.SetMemcacheSetMulti(nds.McClient.SetMulti)
}()

if err := nds.DeleteMulti(c, keys); err == nil {
Expand All @@ -120,7 +119,7 @@ func TestDeleteInTransaction(t *testing.T) {
Val int
}

key := datastore.NewKey(c, "TestEntity", "", 1, nil)
key := datastore.IDKey("TestEntity", 1, nil)
if _, err := nds.Put(c, key, &testEntity{2}); err != nil {
t.Fatal(err)
}
Expand All @@ -130,11 +129,12 @@ func TestDeleteInTransaction(t *testing.T) {
t.Fatal(err)
}

if err := nds.RunInTransaction(c, func(tc context.Context) error {
return nds.DeleteMulti(tc, []*datastore.Key{key})
}, nil); err != nil {
t.Fatal(err)
}
// TODO: enable it
//if err := nds.RunInTransaction(c, func(tc context.Context) error {
// return nds.DeleteMulti(tc, []*datastore.Key{key})
//}, nil); err != nil {
// t.Fatal(err)
//}

if err := nds.Get(c, key, &testEntity{}); err == nil {
t.Fatal("expected no entity")
Expand Down
4 changes: 2 additions & 2 deletions doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Package nds is a Go datastore API for Google App Engine that caches datastore
package nds is a Go datastore API for Google App Engine that caches datastore
calls in memcache in a strongly consistent manner. This often has the effect
of making your app faster as memcache access is often 10x faster than datastore
access. It can also make your app cheaper to run as memcache calls are free.
Expand All @@ -15,7 +15,7 @@ employed by this package.

Use

Package nds is used exactly the same way as appeninge/datastore. Ensure that
package nds is used exactly the same way as appeninge/datastore. Ensure that
you change all your datastore Get, Put, Delete and RunInTransaction function
calls to use nds when converting your own code.

Expand Down
4 changes: 2 additions & 2 deletions export_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"reflect"

"golang.org/x/net/context"
"google.golang.org/appengine/datastore"
"google.golang.org/appengine/memcache"
"cloud.google.com/go/datastore"
"github.com/bradfitz/gomemcache/memcache"
)

var (
Expand Down
Loading