Refactor keys and queries in datastore service and implementation.

impl/prod/memcache.go

 // 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 prod
 
 import (
         "time"
 
         mc "github.com/luci/gae/service/memcache"
@@ skipping 123 matching lines @@
         return nil
 }
 
 func (m mcImpl) CompareAndSwapMulti(items []mc.Item, cb mc.RawCB) error {
         return doCB(memcache.CompareAndSwapMulti(m.Context, mcMF2R(items)), cb)
 }
 
 func (m mcImpl) Increment(key string, delta int64, initialValue *uint64) (uint64, error) {
         if initialValue == nil {
                 return memcache.IncrementExisting(m.Context, key, delta)
-        } else {
-                return memcache.Increment(m.Context, key, delta, *initialValue)
         }
+        return memcache.Increment(m.Context, key, delta, *initialValue)
 }
 
 func (m mcImpl) Flush() error {
         return memcache.Flush(m.Context)
 }
 
 func (m mcImpl) Stats() (*mc.Statistics, error) {
         stats, err := memcache.Stats(m.Context)
         if err != nil {
                 return nil, err
         }
         return (*mc.Statistics)(stats), nil
 }