diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index b1f5cd74..0c8a7d74 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -26,3 +26,6 @@ services: hard: 65536 ports: - 4334:4334 + solr: + volumes: + - ./data/solr:/var/solr diff --git a/docker-compose.yml b/docker-compose.yml index 0b93cd89..f00205c7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,6 +36,13 @@ services: POSTGRES_DB: autoap volumes: - ./data/var/lib/postgresql/data:/var/lib/postgresql/data + solr: + image: solr + ports: + - "8983:8983" + command: + - solr-precreate + - gettingstarted datomic-transactor: depends_on: - database diff --git a/iol_ion/src/iol_ion/query.clj b/iol_ion/src/iol_ion/query.clj index 8f1001a8..cce48832 100644 --- a/iol_ion/src/iol_ion/query.clj +++ b/iol_ion/src/iol_ion/query.clj @@ -36,19 +36,12 @@ (defn sales-orders-in-range [db client start end] (let [end (or end #inst "2050-01-01")] (into #{} - (comp - (map (fn [i] - (dc/index-range db - {:attrid :sales-order/client+date - :start [client start] - :end [client end] - :limit 10000 - :offset (* 10000 i)}))) - - (take-while seq) - (mapcat identity) - (map :e)) - (range)))) + (map (fn [datom] + (:e datom))) + (dc/index-range db + :sales-order/client+date + [client start] + [client end])))) (defn can-see-client? [identity client] diff --git a/src/clj/auto_ap/datomic/sales_orders.clj b/src/clj/auto_ap/datomic/sales_orders.clj index f2455e30..052928fa 100644 --- a/src/clj/auto_ap/datomic/sales_orders.clj +++ b/src/clj/auto_ap/datomic/sales_orders.clj @@ -111,10 +111,6 @@ (merge-query {:query {:find ['?date '?e] :where ['[?e :sales-order/date ?date]]}}))] - (mu/log ::query-stats - :stats (:query-stats (dc/q (assoc query :query-stats true))) - :q (str query)) - (cond->> (query2 query) true (apply-sort-3 (assoc args :default-asc? false)) true (apply-pagination args)))) diff --git a/src/clj/user.clj b/src/clj/user.clj index 5439a24d..1cdcab5d 100644 --- a/src/clj/user.clj +++ b/src/clj/user.clj @@ -3,6 +3,7 @@ [amazonica.aws.s3 :as s3] [auto-ap.datomic :refer [conn pull-attr random-tempid]] [auto-ap.ledger :as l ] + [clj-http.core :as http] [auto-ap.server] [auto-ap.square.core :as square] [auto-ap.square.core2 :as square2] @@ -551,3 +552,16 @@ id (rand-int 100000)]] ["posted" d (str "Random Description - " id) "Travel" nil nil (- amount) nil nil nil nil nil (rand-nth bank-accounts) client-code]) :separator \tab)))) + + +(defn index-solr + [] + ) + +(defn setup-sales-orders [] + (doseq [n (->> (dc/qseq {:query '[:find ?s ?c :where [?s :sales-order/client ?c]] :args [(dc/db auto-ap.datomic/conn)]}) + (map (fn [[s c]] + {:db/id s :sales-order/client c})) + (partition-all 1000) + (take 10))] + @(dc/transact auto-ap.datomic/conn n)))