Remove dsQueryBatch in favor of ds.Batcher.

appengine/datastorecache/cache.go

 // Copyright 2016 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 datastorecache
 
 import (
         "math"
         "strings"
         "time"
 
         "github.com/luci/luci-go/appengine/memlock"
         "github.com/luci/luci-go/common/clock"
         "github.com/luci/luci-go/common/data/rand/mathrand"
         "github.com/luci/luci-go/common/errors"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/retry"
         "github.com/luci/luci-go/server/router"
 
+        "github.com/luci/gae/impl/prod/constraints"
         "github.com/luci/gae/service/datastore"
         "github.com/luci/gae/service/info"
 
         "golang.org/x/net/context"
 )
 
 const (
         initialLoadLockRetries = 3
         initialLoadDelay       = 10 * time.Millisecond
 
@@ skipping 138 matching lines @@
 func (cache *Cache) pruneInterval() time.Duration {
         if cache.AccessUpdateInterval > 0 && cache.PruneFactor > 0 {
                 return cache.AccessUpdateInterval * time.Duration(1+cache.PruneFactor)
         }
         return 0
 }
 
 func (cache *Cache) manager() *manager {
         return &manager{
                 cache:          cache,
-                queryBatchSize: managerQueryBatchSize,
+                queryBatchSize: constraints.DS().QueryBatchSize,
         }
 }
 
 // InstallCronRoute installs a handler for this Cache's management cron task
 // into the supplied Router at the specified path.
 //
 // It is recommended to assert in the middleware that this endpoint is only
 // accessible from a cron task.
 func (cache *Cache) InstallCronRoute(path string, r *router.Router, base router.MiddlewareChain) {
         m := cache.manager()
@@ skipping 279 matching lines @@
 // delta is a factor representing the amount of time that it takes to
 // recalculate the value. Higher delta values allow for earlier recomputation
 // for values that take longer to calculate.
 //
 // beta can be set to >1 to favor earlier recomputations; however, in practice
 // beta=1 works well.
 func xFetch(now, expiry time.Time, delta time.Duration, beta float64, rf randFunc) bool {
         offset := time.Duration(float64(delta) * beta * math.Log(rf()))
         return !now.Add(-offset).Before(expiry)
 }