Skip to content

Add Hint and MaxTimeMS support to Count() #461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fmpwizard wants to merge 4 commits into
base: v2-unstable
Choose a base branch
from
Open

Add Hint and MaxTimeMS support to Count() #461

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3fb76e6
fix running test on mongo 3.2
fmpwizard Jul 2, 2017
532c5ea
Added Hint and MaxTimeMS support to Count()
fmpwizard Jul 2, 2017
f84c737
Both features only wrk starting on 2.6
fmpwizard Jul 3, 2017
652a534
See if cleaning up mongo instances fixes the build
fmpwizard Jul 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Both features only wrk starting on 2.6 
technically speaking, 2.5.5 for the Hint feature
  • Loading branch information
@fmpwizard
fmpwizard committed Jul 3, 2017
commit f84c737b2838e6ea440681287426c61d3c9814cf
2 changes: 1 addition & 1 deletion harness/daemons/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ COMMONSOPTS="

if versionAtLeast 3 2; then
# 3.2 doesn't like --nojournal on config servers.
COMMONCOPTS="$(echo "$COMMONCOPTS" | sed '/--nojournal/d')"
#COMMONCOPTS="$(echo "$COMMONCOPTS" | sed '/--nojournal/d')"
# Using a hacked version of MongoDB 3.2 for now.

# Go back to MMAPv1 so it's not super sluggish. :-(
Expand Down
10 changes: 9 additions & 1 deletion session_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,6 +1188,10 @@ func (s *S) TestCountSkipLimit(c *C) {
}

func (s *S) TestCountMaxTimeMS(c *C) {
if !s.versionAtLeast(2, 6) {
c.Skip("SetMaxTime only supported in 2.6+")
}

session, err := mgo.Dial("localhost:40001")
c.Assert(err, IsNil)
defer session.Close()
Expand All @@ -1203,15 +1207,19 @@ func (s *S) TestCountMaxTimeMS(c *C) {
e := err.(*mgo.QueryError)
// We hope this query took longer than 1 ms, which triggers an error code 50
c.Assert(e.Code, Equals, 50)

}

func (s *S) TestCountHint(c *C) {
if !s.versionAtLeast(2, 6) {
c.Skip("Not implemented until mongo 2.5.5 https://jira.mongodb.org/browse/SERVER-2677")
}

session, err := mgo.Dial("localhost:40001")
c.Assert(err, IsNil)
defer session.Close()

coll := session.DB("mydb").C("mycoll")

err = coll.Insert(M{"n": 1})
c.Assert(err, IsNil)

Expand Down