Refactor keys and queries in datastore service and implementation.

impl/memory/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 memory
 
 import (
         "encoding/binary"
         "sync"
         "time"
@@ skipping 189 matching lines @@
 }
 
 func (m *memcacheImpl) AddMulti(items []mc.Item, cb mc.RawCB) error {
         now := clock.Now(m.ctx)
         doCBs(items, cb, func(itm mc.Item) error {
                 m.data.lock.Lock()
                 defer m.data.lock.Unlock()
                 if !m.data.hasItemLocked(now, itm.Key()) {
                         m.data.setItemLocked(now, itm)
                         return nil
-                } else {
-                        return mc.ErrNotStored
                 }
+                return mc.ErrNotStored
         })
         return nil
 }
 
 func (m *memcacheImpl) CompareAndSwapMulti(items []mc.Item, cb mc.RawCB) error {
         now := clock.Now(m.ctx)
         doCBs(items, cb, func(itm mc.Item) error {
                 m.data.lock.Lock()
                 defer m.data.lock.Unlock()
 
@@ skipping 120 matching lines @@
         return cur, nil
 }
 
 func (m *memcacheImpl) Stats() (*mc.Statistics, error) {
         m.data.lock.RLock()
         defer m.data.lock.RUnlock()
 
         ret := m.data.stats
         return &ret, nil
 }