Split off serialization and key functions to their own packages.

filter/dscache/support.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 dscache
 
 import (
         "fmt"
         "math/rand"
         "time"
@@ skipping 42 matching lines @@
                         ret = make([]string, len(keys))
                 }
                 ret[i] = MakeMemcacheKey(s.mr.Intn(shards), key)
         }
         return ret
 }
 
 func (s *supportContext) mkAllKeys(keys []ds.Key) []string {
         size := 0
         nums := make([]int, len(keys))
-        for i, k := range keys {
-                if !ds.KeyIncomplete(k) {
-                        shards := s.numShards(k)
+        for i, key := range keys {
+                if !key.Incomplete() {
+                        shards := s.numShards(key)
                         nums[i] = shards
                         size += shards
                 }
         }
         if size == 0 {
                 return nil
         }
         ret := make([]string, 0, size)
         for i, key := range keys {
-                if !ds.KeyIncomplete(key) {
+                if !key.Incomplete() {
                         keySuffix := HashKey(key)
                         for shard := 0; shard < nums[i]; shard++ {
                                 ret = append(ret, fmt.Sprintf(KeyFormat, shard, keySuffix))
                         }
                 }
         }
         return ret
 }
 
 // crappyNonce creates a really crappy nonce using math/rand. This is generally
@@ skipping 63 matching lines @@
                 return nil, nil
         }
         ret := make([]memcache.Item, len(mcKeys))
         for i := range ret {
                 ret[i] = (s.mc.NewItem(mcKeys[i]).
                         SetFlags(uint32(ItemHasLock)).
                         SetExpiration(time.Second * time.Duration(LockTimeSeconds)))
         }
         return ret, mcKeys
 }