New caching

engine/cache.go

@@ -8,23 +8,30 @@ import (
 )
 
 var cachemu sync.RWMutex
-var entityCache map[[32]byte]*ecacheItem
+var entityCache map[ecacheKey]*ecacheItem
 var rvkCache map[string]time.Time
 
 var entityCacheTime = 3 * time.Hour
 
+type ecacheKey struct {
+	Hash     [32]byte
+	Location string
+}
+
 type ecacheItem struct {
 	Val         *iapi.Entity
 	CheckExpiry time.Time
 }
 
 func init() {
-	entityCache = make(map[[32]byte]*ecacheItem)
+	entityCache = make(map[ecacheKey]*ecacheItem)
 	rvkCache = make(map[string]time.Time)
 }
 
-func cacheEntity(e *iapi.Entity) {
-	k := e.ArrayKeccak256()
+func cacheEntity(e *iapi.Entity, loc iapi.LocationSchemeInstance) {
+	ar := e.ArrayKeccak256()
+	l := loc.(*iapi.LocationSchemeInstanceURL).SerdesForm.Value
+	k := ecacheKey{ar, l}
 	cachemu.Lock()
 	entityCache[k] = &ecacheItem{
 		Val:         e,
@@ -33,11 +40,13 @@ func cacheEntity(e *iapi.Entity) {
 	cachemu.Unlock()
 }
 
-func getCachedEntity(h iapi.HashSchemeInstance) *iapi.Entity {
-	ak := [32]byte{}
-	copy(ak[:], h.Value())
+func getCachedEntity(h iapi.HashSchemeInstance, loc iapi.LocationSchemeInstance) *iapi.Entity {
+	l := loc.(*iapi.LocationSchemeInstanceURL).SerdesForm.Value
+	ar := [32]byte{}
+	copy(ar[:], h.Value())
+	k := ecacheKey{ar, l}
 	cachemu.RLock()
-	rez, ok := entityCache[ak]
+	rez, ok := entityCache[k]
 	cachemu.RUnlock()
 	if ok && rez.CheckExpiry.After(time.Now()) {
 		return rez.Val

engine/external.go

@@ -450,14 +450,14 @@ func (e *Engine) CheckEntity(ctx context.Context, ent *iapi.Entity) (*Validity,
 
 func (e *Engine) LookupEntity(ctx context.Context, hash iapi.HashSchemeInstance, loc iapi.LocationSchemeInstance) (*iapi.Entity, *Validity, error) {
 	var err error
-	ent := getCachedEntity(hash)
+	ent := getCachedEntity(hash, loc)
 	if ent == nil {
 		ent, err = e.ws.GetEntityByHashSchemeInstanceG(ctx, hash)
 		if err != nil {
 			return nil, nil, err
 		}
 		if ent != nil {
-			cacheEntity(ent)
+			cacheEntity(ent, loc)
 		}
 	}
 
@@ -484,7 +484,7 @@ func (e *Engine) LookupEntity(ctx context.Context, hash iapi.HashSchemeInstance,
 		return nil, nil, err
 	}
 
-	cacheEntity(ent)
+	cacheEntity(ent, loc)
 
 	val, err := e.CheckEntity(ctx, ent)
 	//fmt.Printf("validity in lookup: %v\n", val)

engine/states.go

@@ -45,7 +45,7 @@ nextlocation:
 	for _, loc := range locs {
 		hashscheme, err := e.st.HashSchemeFor(loc)
 		if err != nil {
-			panic(err)
+			continue //problem with this location
 		}
 		for {
 			// get current token