Browse Source

Update datascript

Tienson Qin 1 year ago
parent
commit
716c496590
4 changed files with 9 additions and 26 deletions
  1. 2 6
      deps.edn
  2. 2 7
      deps/db/deps.edn
  3. 3 8
      deps/db/src/logseq/db/sqlite/db.cljs
  4. 2 5
      deps/outliner/deps.edn

+ 2 - 6
deps.edn

@@ -3,13 +3,9 @@
  {org.clojure/clojure                   {:mvn/version "1.11.1"}
   rum/rum                               {:mvn/version "0.12.9"}
 
-  datascript/datascript        {:local/root "../../datascript"
-                                :exclusions [persistent-sorted-set/persistent-sorted-set]}
-  ;; datascript/datascript        {:git/url "https://github.com/logseq/datascript" ;; fork
-  ;;                               :sha     "f0922f4d10714636711bc0176409290e44ce2feb"
-  ;;                               :exclusions [persistent-sorted-set/persistent-sorted-set]}
+  datascript/datascript        {:git/url "https://github.com/logseq/datascript" ;; fork
+                                :sha     "53fcbc6a3bb31150086cb2f2631666a8cc1523a5"}
 
-  persistent-sorted-set/persistent-sorted-set {:local/root "../../persistent-sorted-set"}
   datascript-transit/datascript-transit {:mvn/version "0.3.0"}
   borkdude/rewrite-edn                  {:mvn/version "0.4.7"}
   funcool/promesa                       {:mvn/version "4.0.2"}

+ 2 - 7
deps/db/deps.edn

@@ -1,12 +1,7 @@
 {:deps
  ;; External deps should be kept in sync with https://github.com/logseq/nbb-logseq/blob/main/bb.edn
- {datascript/datascript        {:local/root "../../../../datascript"
-                                :exclusions [persistent-sorted-set/persistent-sorted-set]}
-  ;; datascript/datascript        {:git/url "https://github.com/logseq/datascript" ;; fork
-  ;;                               :sha     "f0922f4d10714636711bc0176409290e44ce2feb"
-  ;;                               :exclusions [persistent-sorted-set/persistent-sorted-set]}
-
-  persistent-sorted-set/persistent-sorted-set {:local/root "../../../../persistent-sorted-set"}
+ {datascript/datascript {:git/url "https://github.com/logseq/datascript" ;; fork
+                         :sha     "53fcbc6a3bb31150086cb2f2631666a8cc1523a5"}
   com.cognitect/transit-cljs   {:mvn/version "0.8.280"}
   cljs-bean/cljs-bean          {:mvn/version "1.5.0"}
   org.clojars.mmb90/cljs-cache {:mvn/version "0.1.4"}}

+ 3 - 8
deps/db/src/logseq/db/sqlite/db.cljs

@@ -99,11 +99,9 @@
 (defn sqlite-storage
   [repo {:keys [threshold]
          :or {threshold 4096}}]
-  (let [cache (cache/lru-cache-factory {} :threshold threshold)]
+  (let [_cache (cache/lru-cache-factory {} :threshold threshold)]
     (reify IStorage
       (-store [_ addr+data-seq]
-        (prn :debug :store-addr (map first addr+data-seq))
-        (prn :debug :store {:addr-data addr+data-seq})
         (let [data (->>
                     (map
                      (fn [[addr data]]
@@ -114,12 +112,9 @@
           (upsert-addr-content! repo data)))
       (-restore [_ addr]
         (let [content (restore-data-from-addr repo addr)]
-          (when (nil? content)
-            (prn :debug :error :addr-not-exists addr))
-          (prn :debug :restored {:addr addr
-                                 ;; :content content
-                                 })
+          (assert (nil? content) (str "Restore address data not exists, addr: " addr))
           (edn/read-string content))
+        ;; disable cache for now
         ;; (when-let [content (if (cache/has? cache addr)
         ;;                      (do
         ;;                        (cache/hit cache addr)

+ 2 - 5
deps/outliner/deps.edn

@@ -1,10 +1,7 @@
 {:deps
  ;; External deps should be kept in sync with https://github.com/logseq/nbb-logseq/blob/main/bb.edn
- {datascript/datascript        {:local/root "../../../../datascript"
-                                :exclusions [persistent-sorted-set/persistent-sorted-set]}
-  persistent-sorted-set/persistent-sorted-set {:local/root "../../persistent-sorted-set"}
-  ;; datascript/datascript {:git/url "https://github.com/logseq/datascript" ;; fork
-  ;;                        :sha     "f0922f4d10714636711bc0176409290e44ce2feb"}
+ {datascript/datascript {:git/url "https://github.com/logseq/datascript" ;; fork
+                         :sha     "53fcbc6a3bb31150086cb2f2631666a8cc1523a5"}
   logseq/db             {:local/root "../db"}
   com.cognitect/transit-cljs {:mvn/version "0.8.280"}}
  :aliases