luciano/monger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #47 from zussitarze/master

Browse source 
Close DBCurors in find-maps
This commit is contained in:
Michael Klishin 2013-01-11 03:11:02 -08:00
commit 8fd78c3a19
2 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/clojure/monger/collection.clj
View file

@ -164,24 +164,32 @@
If you want to work directly with DBObject, use find.
"
([^String collection]
(map (fn [x] (from-db-object x true)) (find collection)))
(with-open [dbc (find collection)]
(map (fn [x] (from-db-object x true)) dbc)))
([^String collection ^Map ref]
(map (fn [x] (from-db-object x true)) (find collection ref)))
(with-open [dbc (find collection ref)]
(map (fn [x] (from-db-object x true)) dbc)))
([^String collection ^Map ref fields]
(map (fn [x] (from-db-object x true)) (find collection ref fields)))
(with-open [dbc (find collection ref fields)]
(map (fn [x] (from-db-object x true)) dbc)))
([^DB db ^String collection ^Map ref fields]
(map (fn [x] (from-db-object x true)) (find db collection ref fields))))
(with-open [dbc (find db collection ref fields)]
(map (fn [x] (from-db-object x true)) dbc))))
(defn find-seq
"Queries for objects in this collection, returns ISeq of DBObjects."
([^String collection]
(seq (find collection)))
(with-open [dbc (find collection)]
(seq dbc)))
([^String collection ^Map ref]
(seq (find collection ref)))
(with-open [dbc (find collection ref)]
(seq dbc)))
([^String collection ^Map ref fields]
(seq (find collection ref fields)))
(with-open [dbc (find collection ref fields)]
(seq dbc)))
([^DB db ^String collection ^Map ref fields]
(seq (find db collection ref fields))))
(with-open [dbc (find db collection ref fields)]
(seq dbc))))
;;
;; monger.collection/find-one

12
src/clojure/monger/query.clj
View file

@ -64,12 +64,12 @@
(defn exec
[{ :keys [^DBCollection collection query fields skip limit sort batch-size hint snapshot read-preference keywordize-fields options] :or { limit 0 batch-size 256 skip 0 } }]
(let [cursor (doto (.find collection (to-db-object query) (as-field-selector fields))
(.limit limit)
(.skip skip)
(.sort (to-db-object sort))
(.batchSize batch-size)
(.hint (to-db-object hint)))]
(with-open [cursor (doto (.find collection (to-db-object query) (as-field-selector fields))
(.limit limit)
(.skip skip)
(.sort (to-db-object sort))
(.batchSize batch-size)
(.hint (to-db-object hint)))]
(when snapshot
(.snapshot cursor))
(when read-preference