No need for vg 'alias' to store/persist and reduces future flexibility

Author: bplatz

src/fluree/db/flake/index/storage.cljc

@@ -179,8 +179,9 @@
     (loop [[[vg-alias storage-meta] & r] vg-address-map
            vg-map         {}]
       (if vg-alias
-        (let [vg (<? (vg/read-vg index-catalog storage-meta))]
-          (recur r (assoc vg-map (:alias vg) vg)))
+        (let [vg          (<? (vg/read-vg index-catalog storage-meta))
+              named-graph (vg/named-graph-alias vg)]
+          (recur r (assoc vg-map named-graph vg)))
         vg-map))))
 
 (defn read-db-root

src/fluree/db/virtual_graph.cljc

@@ -34,3 +34,10 @@
   (if (str/starts-with? vg-alias "##")
     (subs vg-alias 2)
     vg-alias))
+
+(defn named-graph-alias
+  "Returns the virtual graph's named graph alias
+   
+   We currently use the syntax '##<vg-name>' for a named graph alias."
+  [{:keys [vg-name] :as _vg}]
+  (str "##" vg-name))

src/fluree/db/virtual_graph/bm25/index.clj

@@ -226,7 +226,7 @@
     (bm25-upsert* bm25 db nil items-ch)))
 
 (defrecord BM25-VirtualGraph [id stemmer stopwords k1 b index-state initialized genesis-t t
-                              alias query parsed-query property-deps 
+                              vg-name query parsed-query property-deps 
                               db-alias namespaces namespace-codes] ;; these items taken from db - is kept up to date with new db updates
 
   iri/IRICodec

src/fluree/db/virtual_graph/bm25/storage.clj

@@ -88,7 +88,7 @@
 (defn vg-data
   [vg]
   (-> vg
-      (select-keys [:k1 :b :index-state :initialized :genesis-t :t :alias :db-alias
+      (select-keys [:k1 :b :index-state :initialized :genesis-t :t :db-alias
                     :query :namespace-codes :property-deps :type :lang :id :vg-name])
       (update :id iri/serialize-sid)
       (update :index-state state-data)
@@ -109,23 +109,23 @@
         query-props  (parse/get-query-props parsed-query)
         property-deps (get-property-sids namespaces query-props)]
     (-> vg-data
-        (assoc :parsed-query parsed-query)
-        (assoc :namespaces namespaces)
-        (assoc :property-deps property-deps)
-        (assoc :stemmer (stemmer/initialize lang))
-        (assoc :stopwords (stopwords/initialize lang))
+        (assoc :parsed-query parsed-query
+               :namespaces namespaces
+               :property-deps property-deps
+               :stemmer (stemmer/initialize lang)
+               :stopwords (stopwords/initialize lang))
         (update :id iri/deserialize-sid)
         (update :type (partial mapv iri/deserialize-sid))
         (update :index-state reify-state)
         (update :b coerce-double)
         (update :k1 coerce-double))))
 
 (defmethod vg/write-vg :bm25
-  [{:keys [storage serializer] :as _index-catalog} {:keys [alias db-alias] :as vg}]
+  [{:keys [storage serializer] :as _index-catalog} {:keys [vg-name db-alias] :as vg}]
   (go-try
     (let [data            (vg-data vg)
           serialized-data (serde/-serialize-bm25 serializer data)
-          path            (vg/storage-path :bm25 db-alias (vg/trim-alias-ref alias))
+          path            (vg/storage-path :bm25 db-alias vg-name)
           write-res       (<? (storage/content-write-json storage path serialized-data))]
       (assoc write-res :type "bm25"))))
 

src/fluree/db/virtual_graph/index_graph.cljc

@@ -38,21 +38,14 @@
     :query   nil}
    index-flakes))
 
-(defn add-vg-id
-  "Adds the full virtual graph IRI to the index options map"
-  [{:keys [vg-name] :as idx-opts} db-alias]
-  (let [vg-alias (str "##" vg-name)]
-    (assoc idx-opts :alias vg-alias)))
-
 #?(:clj
    (defn create
-     [{:keys [alias t] :as db} vg-flakes]
+     [{:keys [t] :as db} vg-flakes]
      (let [db-vol (volatile! db) ;; needed to potentially add new namespace codes based on query IRIs
 
-           {:keys [type alias] :as vg-opts}
+           {:keys [type] :as vg-opts}
            (-> (idx-flakes->opts vg-flakes)
                (vg-parse/parse-document-query db-vol)
-               (add-vg-id alias)
                (assoc :genesis-t t))
 
            db* @db-vol
@@ -64,8 +57,8 @@
                  :else (throw (ex-info "Unrecognized virtual graph creation attempted."
                                        {:status 400
                                         :error  :db/invalid-index})))
-           initialized-vg (vg/initialize vg db*)]
-       [db* alias initialized-vg]))
+           vg* (vg/initialize vg db*)]
+       [db* vg*]))
 
    :cljs
    (defn create
@@ -93,9 +86,9 @@
   ;; at least currently, updates to vg are async
   ;; and happen in background.
   (let [vg* (reduce-kv
-             (fn [vg* vg-alias vg-impl]
-               (log/debug "Virtual Graph update started for: " vg-alias)
-               (assoc vg* vg-alias (vg/upsert vg-impl db add remove)))
+             (fn [vg* named-graph vg-impl]
+               (log/debug "Virtual Graph update started for: " named-graph)
+               (assoc vg* named-graph (vg/upsert vg-impl db add remove)))
              {} vg)]
     (assoc db :vg vg*)))
 
@@ -106,10 +99,11 @@
   (loop [[new-vg & r] new-vgs
          db db]
     (if new-vg
-      (let [vg-flakes (filter #(= (flake/s %) new-vg) add)
-            [db* alias vg-record] (create db vg-flakes)]
+      (let [vg-flakes   (filter #(= (flake/s %) new-vg) add)
+            [db* vg]    (create db vg-flakes)
+            named-graph (vg/named-graph-alias vg)]
         ;; TODO - VG - ensure alias is not being used, throw if so
-        (recur r (assoc-in db* [:vg alias] vg-record)))
+        (recur r (assoc-in db* [:vg named-graph] vg)))
       db)))
 
 (defn has-vgs?