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

Merge pull request #23 from ghoseb/master

Browse source 
Remove redundant invocation of `to-db-object` on top of `as-field-selector`.
This commit is contained in:
Michael Klishin 2012-05-12 01:52:35 -07:00
commit 008460e327
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/monger/collection.clj
View file

@ -103,12 +103,12 @@
(.find ^DBCollection coll ^DBObject (to-db-object ref)))) (.find ^DBCollection coll ^DBObject (to-db-object ref))))
([^String collection ^Map ref fields] ([^String collection ^Map ref fields]
(let [^DBCollection coll (.getCollection monger.core/*mongodb-database* collection) (let [^DBCollection coll (.getCollection monger.core/*mongodb-database* collection)
map-of-fields (as-field-selector fields)] ^DBObject fields-obj (as-field-selector fields)]
(.find ^DBCollection coll ^DBObject (to-db-object ref) ^DBObject (to-db-object map-of-fields)))) (.find ^DBCollection coll ^DBObject (to-db-object ref) fields-obj)))
([^DB db ^String collection ^Map ref fields] ([^DB db ^String collection ^Map ref fields]
(let [^DBCollection coll (.getCollection db collection) (let [^DBCollection coll (.getCollection db collection)
map-of-fields (as-field-selector fields)] ^DBObject fields-obj (as-field-selector fields)]
(.find ^DBCollection coll ^DBObject (to-db-object ref) ^DBObject (to-db-object map-of-fields))))) (.find ^DBCollection coll ^DBObject (to-db-object ref) fields-obj))))
(defn ^ISeq find-maps (defn ^ISeq find-maps
"Queries for objects in this collection. "Queries for objects in this collection.
@ -156,12 +156,12 @@
(.findOne ^DBCollection coll ^DBObject (to-db-object ref)))) (.findOne ^DBCollection coll ^DBObject (to-db-object ref))))
([^String collection ^Map ref fields] ([^String collection ^Map ref fields]
(let [^DBCollection coll (.getCollection monger.core/*mongodb-database* collection) (let [^DBCollection coll (.getCollection monger.core/*mongodb-database* collection)
map-of-fields (as-field-selector fields)] ^DBObject fields-obj (as-field-selector fields)]
(.findOne ^DBCollection coll ^DBObject (to-db-object ref) ^DBObject (to-db-object map-of-fields)))) (.findOne ^DBCollection coll ^DBObject (to-db-object ref) fields-obj)))
([^DB db ^String collection ^Map ref fields] ([^DB db ^String collection ^Map ref fields]
(let [^DBCollection coll (.getCollection db collection) (let [^DBCollection coll (.getCollection db collection)
map-of-fields (as-field-selector fields)] ^DBObject fields-obj (as-field-selector fields)]
(.findOne ^DBCollection coll ^DBObject (to-db-object ref) ^DBObject (to-db-object map-of-fields))))) (.findOne ^DBCollection coll ^DBObject (to-db-object ref) fields-obj))))
(defn ^IPersistentMap find-one-as-map (defn ^IPersistentMap find-one-as-map
"Returns a single object converted to Map from this collection matching the query." "Returns a single object converted to Map from this collection matching the query."
@ -204,7 +204,7 @@
([^String collection ^Map conditions ^Map document & { :keys [fields sort remove return-new upsert keywordize] :or ([^String collection ^Map conditions ^Map document & { :keys [fields sort remove return-new upsert keywordize] :or
{ fields nil sort nil remove false return-new false upsert false keywordize true }}] { fields nil sort nil remove false return-new false upsert false keywordize true }}]
(let [^DBCollection coll (.getCollection monger.core/*mongodb-database* collection) (let [^DBCollection coll (.getCollection monger.core/*mongodb-database* collection)
maybe-fields (when fields (to-db-object (as-field-selector fields))) maybe-fields (when fields (as-field-selector fields))
maybe-sort (when sort (to-db-object sort))] maybe-sort (when sort (to-db-object sort))]
(from-db-object (from-db-object
^DBObject (.findAndModify ^DBCollection coll ^DBObject (to-db-object conditions) maybe-fields maybe-sort remove ^DBObject (.findAndModify ^DBCollection coll ^DBObject (to-db-object conditions) maybe-fields maybe-sort remove