Barely tested App Engine stat handler support.

Change-Id: Ia8abc53e3f538198773940f9515ff551e97eb8de
This commit is contained in:
Brad Fitzpatrick 2011-10-06 23:24:40 -07:00
parent e69c74af54
commit e9991b1702
2 changed files with 49 additions and 9 deletions

View File

@ -157,10 +157,14 @@ func commonUploadResponse(configer blobserver.Configer, req *http.Request) map[s
ret["maxUploadSize"] = 2147483647 // 2GB.. *shrug*. TODO: cut this down, standardize
ret["uploadUrlExpirationSeconds"] = 86400
if configer == nil || configer.Config() == nil {
ret["uploadUrl"] = "../XXXXXXXXXXXXX/TODO" // TODO: broken case
} else {
// TODO: camli/upload isn't part of the spec. we should pick
// something different here just to make it obvious that this
// isn't a well-known URL and accidentally encourage lazy clients.
ret["uploadUrl"] = configer.Config().URLBase + "/camli/upload"
}
return ret
}

View File

@ -20,6 +20,7 @@ import (
"bytes"
"http"
"io"
"log"
"os"
"appengine"
@ -31,6 +32,10 @@ import (
"camli/jsonconfig"
)
var _ = log.Printf
const blobKind = "Blob"
type appengineStorage struct {
*blobserver.SimpleBlobHubPartitionMap
@ -116,7 +121,7 @@ func (sto *appengineStorage) ReceiveBlob(br *blobref.BlobRef, in io.Reader) (sb
ent.Size = written
ent.BlobKey = bkey
dkey := datastore.NewKey(sto.ctx, "Blob", br.String(), 0, nil)
dkey := datastore.NewKey(sto.ctx, blobKind, br.String(), 0, nil)
_, err = datastore.Put(sto.ctx, dkey, &ent)
if err != nil {
blobstore.Delete(sto.ctx, bkey) // TODO: insert into task queue on error to try later?
@ -137,7 +142,38 @@ func (sto *appengineStorage) StatBlobs(dest chan<- blobref.SizedBlobRef, blobs [
if sto.ctx == nil {
return errNoContext
}
return os.NewError("TODO-AppEngine-StatBlobs")
var (
keys = make([]*datastore.Key, 0, len(blobs))
out = make([]interface{}, 0, len(blobs))
errs = make([]os.Error, len(blobs))
)
for _, br := range blobs {
keys = append(keys, datastore.NewKey(sto.ctx, blobKind, br.String(), 0, nil))
out = append(out, new(blobEnt))
}
err := datastore.GetMulti(sto.ctx, keys, out)
if merr, ok := err.(datastore.ErrMulti); ok {
errs = []os.Error(merr)
err = nil
}
if err != nil {
return err
}
for i, br := range blobs {
thisErr := errs[i]
if thisErr == datastore.ErrNoSuchEntity {
continue
}
if thisErr != nil {
err = errs[i] // just return last one found?
continue
}
ent := out[i].(*blobEnt)
if ent.BlobRefStr != "" {
dest <- blobref.SizedBlobRef{br, ent.Size}
}
}
return err
}
func (sto *appengineStorage) EnumerateBlobs(dest chan<- blobref.SizedBlobRef, after string, limit uint, waitSeconds int) os.Error {