Refactor a bit.

raw_datastore.go

Index: raw_datastore.go
diff --git a/raw_datastore.go b/raw_datastore.go
deleted file mode 100644
index 809d958c57c3efc3fec217dcf8ea8878591b4e44..0000000000000000000000000000000000000000
--- a/raw_datastore.go
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package gae
-
-import (
-	"fmt"
-
-	"golang.org/x/net/context"
-)
-
-/// Kinds + Keys
-
-// DSKey is the equivalent of *datastore.Key from the original SDK, except that
-// it can have multiple implementations. See helper.DSKey* methods for missing
-// methods like DSKeyIncomplete (and some new ones like DSKeyValid).
-type DSKey interface {
-	Kind() string
-	StringID() string
-	IntID() int64
-	Parent() DSKey
-	AppID() string
-	Namespace() string
-
-	String() string
-}
-
-// DSKeyTok is a single token from a multi-part DSKey.
-type DSKeyTok struct {
-	Kind     string
-	IntID    int64
-	StringID string
-}
-
-// DSCursor wraps datastore.Cursor.
-type DSCursor interface {
-	fmt.Stringer
-}
-
-// DSQuery wraps datastore.Query.
-type DSQuery interface {
-	Ancestor(ancestor DSKey) DSQuery
-	Distinct() DSQuery
-	End(c DSCursor) DSQuery
-	EventualConsistency() DSQuery
-	Filter(filterStr string, value interface{}) DSQuery
-	KeysOnly() DSQuery
-	Limit(limit int) DSQuery
-	Offset(offset int) DSQuery
-	Order(fieldName string) DSQuery
-	Project(fieldNames ...string) DSQuery
-	Start(c DSCursor) DSQuery
-}
-
-// CommonDatastore is the interface for the methods which are common between
-// helper.Datastore and RawDatastore.
-type CommonDatastore interface {
-	NewKey(kind, stringID string, intID int64, parent DSKey) DSKey
-	DecodeKey(encoded string) (DSKey, error)
-
-	NewQuery(kind string) DSQuery
-	Count(q DSQuery) (int, error)
-
-	RunInTransaction(f func(c context.Context) error, opts *DSTransactionOptions) error
-}
-
-// RDSIterator wraps datastore.Iterator.
-type RDSIterator interface {
-	Cursor() (DSCursor, error)
-	Next(dst DSPropertyLoadSaver) (DSKey, error)
-}
-
-// RawDatastore implements the datastore functionality without any of the fancy
-// reflection stuff. This is so that Filters can avoid doing lots of redundant
-// reflection work. See helper.Datastore for a more user-friendly interface.
-type RawDatastore interface {
-	CommonDatastore
-
-	Run(q DSQuery) RDSIterator
-	GetAll(q DSQuery, dst *[]DSPropertyMap) ([]DSKey, error)
-
-	Put(key DSKey, src DSPropertyLoadSaver) (DSKey, error)
-	Get(key DSKey, dst DSPropertyLoadSaver) error
-	Delete(key DSKey) error
-
-	// These allow you to read and write a multiple datastore objects in
-	// a non-atomic batch.
-	DeleteMulti(keys []DSKey) error
-	GetMulti(keys []DSKey, dst []DSPropertyLoadSaver) error
-	PutMulti(keys []DSKey, src []DSPropertyLoadSaver) ([]DSKey, error)
-}
-
-// RDSFactory is the function signature for factory methods compatible with
-// SetRDSFactory.
-type RDSFactory func(context.Context) RawDatastore
-
-// RDSFilter is the function signature for a filter RDS implementation. It
-// gets the current RDS implementation, and returns a new RDS implementation
-// backed by the one passed in.
-type RDSFilter func(context.Context, RawDatastore) RawDatastore
-
-// GetRDSUnfiltered gets gets the RawDatastore implementation from context without
-// any of the filters applied.
-func GetRDSUnfiltered(c context.Context) RawDatastore {
-	if f, ok := c.Value(rawDatastoreKey).(RDSFactory); ok && f != nil {
-		return f(c)
-	}
-	return nil
-}
-
-// GetRDS gets the RawDatastore implementation from context.
-func GetRDS(c context.Context) RawDatastore {
-	ret := GetRDSUnfiltered(c)
-	if ret == nil {
-		return nil
-	}
-	for _, f := range getCurRDSFilters(c) {
-		ret = f(c, ret)
-	}
-	return ret
-}
-
-// SetRDSFactory sets the function to produce Datastore instances, as returned by
-// the GetRDS method.
-func SetRDSFactory(c context.Context, rdsf RDSFactory) context.Context {
-	return context.WithValue(c, rawDatastoreKey, rdsf)
-}
-
-// SetRDS sets the current Datastore object in the context. Useful for testing
-// with a quick mock. This is just a shorthand SetDSFactory invocation to set
-// a factory which always returns the same object.
-func SetRDS(c context.Context, rds RawDatastore) context.Context {
-	return SetRDSFactory(c, func(context.Context) RawDatastore { return rds })
-}
-
-func getCurRDSFilters(c context.Context) []RDSFilter {
-	curFiltsI := c.Value(rawDatastoreFilterKey)
-	if curFiltsI != nil {
-		return curFiltsI.([]RDSFilter)
-	}
-	return nil
-}
-
-// AddRDSFilters adds RawDatastore filters to the context.
-func AddRDSFilters(c context.Context, filts ...RDSFilter) context.Context {
-	if len(filts) == 0 {
-		return c
-	}
-	cur := getCurRDSFilters(c)
-	newFilts := make([]RDSFilter, 0, len(cur)+len(filts))
-	newFilts = append(newFilts, getCurRDSFilters(c)...)
-	newFilts = append(newFilts, filts...)
-	return context.WithValue(c, rawDatastoreFilterKey, newFilts)
-}