From ef356e423d7e222cff031e4b24ccbbfa37e26c55 Mon Sep 17 00:00:00 2001
From: Bo Xu <shifucun@users.noreply.github.com>
Date: Mon, 20 Nov 2023 23:10:35 +0000
Subject: [PATCH] Always create Cache object, so custom provenance can be
 created even enable_search is false (#1299)

---
 cmd/main.go                    | 10 +++++++++-
 internal/server/cache/cache.go |  8 --------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cmd/main.go b/cmd/main.go
index d49695afa..4ed32c285 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -34,6 +34,7 @@ import (
 	"github.com/datacommonsorg/mixer/internal/server/resource"
 	"github.com/datacommonsorg/mixer/internal/sqldb"
 	"github.com/datacommonsorg/mixer/internal/sqldb/cloudsql"
+	"github.com/datacommonsorg/mixer/internal/sqldb/query"
 	"github.com/datacommonsorg/mixer/internal/sqldb/sqlite"
 	"github.com/datacommonsorg/mixer/internal/store"
 	"github.com/datacommonsorg/mixer/internal/store/bigtable"
@@ -224,7 +225,7 @@ func main() {
 	}
 	// Build the cache that includes stat var group info and stat var search
 	// Index.
-	var c *resource.Cache
+	c := &resource.Cache{}
 	if *useSearch {
 		c, err = cache.NewCache(
 			ctx, store,
@@ -237,6 +238,13 @@ func main() {
 			log.Fatalf("Failed to create cache: %v", err)
 		}
 	}
+	if store.SQLClient != nil {
+		customProv, err := query.GetProvenances(store.SQLClient)
+		if err != nil {
+			log.Fatalf("Failed to get provenance from SQL database: %s", err)
+		}
+		c.CustomProvenances = customProv
+	}
 
 	// Maps client
 	var mapsClient *maps.Client
diff --git a/internal/server/cache/cache.go b/internal/server/cache/cache.go
index 9c69d0957..b7bf1390b 100644
--- a/internal/server/cache/cache.go
+++ b/internal/server/cache/cache.go
@@ -22,7 +22,6 @@ import (
 
 	"github.com/datacommonsorg/mixer/internal/server/resource"
 	"github.com/datacommonsorg/mixer/internal/server/statvar"
-	"github.com/datacommonsorg/mixer/internal/sqldb/query"
 	"github.com/datacommonsorg/mixer/internal/store"
 )
 
@@ -72,12 +71,5 @@ func NewCache(
 			result.SvgSearchIndex = statvar.BuildStatVarSearchIndex(rawSvg, parentSvgMap, blocklistSvg)
 		}
 	}
-	if store.SQLClient != nil {
-		customProv, err := query.GetProvenances(store.SQLClient)
-		if err != nil {
-			return nil, err
-		}
-		result.CustomProvenances = customProv
-	}
 	return result, nil
 }