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

Merge branch '3.0.x-stable'

Browse source
This commit is contained in:
Michael Klishin 2016-01-10 23:46:23 +03:00
commit 189d347f50
3 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog.md
View file

@ -1,4 +1,12 @@
## Changes between 3.0.0 and 3.1.0 ## Changes between 3.0.x and 3.1.0
### MongoDB Java Driver Update
MongoDB Java driver dependency has been updated to `3.2.0`.
### Cursor Hinting Option Fix
Contributed by Stijn Opheide.
### Improved DBObject to Clojure Map conversion performance ### Improved DBObject to Clojure Map conversion performance
@ -15,11 +23,6 @@ In some cases Monger ignored provided credentials.
Contributed by Artem Chistyakov. Contributed by Artem Chistyakov.
### MongoDB Java Driver Update
MongoDB Java driver dependency has been updated to `3.0.4`.
## Changes between 2.1.0 and 3.0.0 ## Changes between 2.1.0 and 3.0.0

2
project.clj
View file

@ -5,7 +5,7 @@
:license {:name "Eclipse Public License" :license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"} :url "http://www.eclipse.org/legal/epl-v10.html"}
:dependencies [[org.clojure/clojure "1.7.0"] :dependencies [[org.clojure/clojure "1.7.0"]
[org.mongodb/mongodb-driver "3.0.4"] [org.mongodb/mongodb-driver "3.2.0"]
[clojurewerkz/support "1.1.0"]] [clojurewerkz/support "1.1.0"]]
:test-selectors {:default (fn [m] :test-selectors {:default (fn [m]
(and (not (:performance m)) (and (not (:performance m))

15
test/monger/test/indexing_test.clj
View file

@ -13,14 +13,12 @@
(let [collection "libraries"] (let [collection "libraries"]
(mc/drop-indexes db collection) (mc/drop-indexes db collection)
(mc/create-index db collection {"language" 1}) (mc/create-index db collection {"language" 1})
(is (= "language_" (is (= "language_1"
(:name (second (mc/indexes-on db collection))))) (:name (second (mc/indexes-on db collection)))))
(mc/drop-indexes db collection) (mc/drop-indexes db collection)
(mc/create-index db collection ["language"])
(mc/drop-index db collection {"language" 1})
(is (nil? (second (mc/indexes-on db collection)))) (is (nil? (second (mc/indexes-on db collection))))
(mc/ensure-index db collection (array-map "language" 1) {:unique true}) (mc/ensure-index db collection (array-map "language" 1) {:unique true})
(is (= "language_" (is (= "language_1"
(:name (second (mc/indexes-on db collection))))) (:name (second (mc/indexes-on db collection)))))
(mc/drop-indexes db collection) (mc/drop-indexes db collection)
(mc/ensure-index db collection (array-map "language" 1)) (mc/ensure-index db collection (array-map "language" 1))
@ -32,17 +30,18 @@
(deftest ^{:indexing true :time-consuming true} test-ttl-collections (deftest ^{:indexing true :time-consuming true} test-ttl-collections
(let [coll "recent_events" (let [coll "recent_events"
ttl 30 ttl 15
sleep 120] sleep 65]
(mc/remove db coll) (mc/remove db coll)
(mc/drop-indexes db coll)
(mc/ensure-index db coll (array-map :created-at 1) {:expireAfterSeconds ttl}) (mc/ensure-index db coll (array-map :created-at 1) {:expireAfterSeconds ttl})
(dotimes [i 100] (dotimes [i 100]
(mc/insert db coll {:type "signup" :created-at (-> i seconds ago) :i i})) (mc/insert db coll {:type "signup" :created-at (-> i seconds ago) :i i}))
(dotimes [i 100] (dotimes [i 100]
(mc/insert db coll {:type "signup" :created-at (-> i seconds from-now) :i i})) (mc/insert db coll {:type "signup" :created-at (-> i seconds from-now) :i i}))
(is (= 200 (mc/count db coll {:type "signup"}))) (is (= 200 (mc/count db coll {:type "signup"})))
;; sleep for 65 seconds. MongoDB 2.1.2 seems to run TTLMonitor once per minute, according to ;; sleep for > 60 seconds. MongoDB seems to run TTLMonitor once per minute, according to
;; the log. MK. ;; the log.
(println (format "Now sleeping for %d seconds to test TTL collections!" sleep)) (println (format "Now sleeping for %d seconds to test TTL collections!" sleep))
(Thread/sleep (* sleep 1000)) (Thread/sleep (* sleep 1000))
(println (format "Documents in the TTL collection: %d" (mc/count db coll {:type "signup"}))) (println (format "Documents in the TTL collection: %d" (mc/count db coll {:type "signup"})))