Interface update, per-method Contexts.

service/datastore/finalized_query.go

 // Copyright 2015 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package datastore
 
 import (
         "bytes"
         "fmt"
         "sort"
@@ skipping 294 matching lines @@
         }
 
         return ret.String()
 }
 
 func (q *FinalizedQuery) String() string {
         // TODO(riannucci): make a more compact go-like representation here.
         return q.GQL()
 }
 
-// Valid returns true iff this FinalizedQuery is valid in the provided appID and
-// namespace.
+// Valid returns true iff this FinalizedQuery is valid in the provided
+// KeyContext's App ID and Namespace.
 //
 // This checks the ancestor filter (if any), as well as the inequality filters
 // if they filter on '__key__'.
 //
 // In particular, it does NOT validate equality filters which happen to have
 // values of type PTKey, nor does it validate inequality filters that happen to
 // have values of type PTKey (but don't filter on the magic '__key__' field).
-func (q *FinalizedQuery) Valid(aid, ns string) error {
+func (q *FinalizedQuery) Valid(kc KeyContext) error {
         anc := q.Ancestor()
-        if anc != nil && (!anc.Valid(false, aid, ns) || anc.IsIncomplete()) {
+        if anc != nil && (!anc.Valid(false, kc) || anc.IsIncomplete()) {
                 return ErrInvalidKey
         }
 
         if q.ineqFiltProp == "__key__" {
-                if q.ineqFiltLowSet && !q.ineqFiltLow.Value().(*Key).Valid(false, aid, ns) {
+                if q.ineqFiltLowSet && !q.ineqFiltLow.Value().(*Key).Valid(false, kc) {
                         return ErrInvalidKey
                 }
-                if q.ineqFiltHighSet && !q.ineqFiltHigh.Value().(*Key).Valid(false, aid, ns) {
+                if q.ineqFiltHighSet && !q.ineqFiltHigh.Value().(*Key).Valid(false, kc) {
                         return ErrInvalidKey
                 }
         }
         return nil
 }