Merge pull request #251 from Larrouse2015/master

cursor bug fix

Author: comtihon

include/mongo_protocol.hrl

@@ -48,7 +48,8 @@
 -record(getmore, {
   collection :: colldb(),
   batchsize = 0 :: mc_worker_api:batchsize(),
-  cursorid :: mc_worker_api:cursorid()
+  cursorid :: mc_worker_api:cursorid(),
+  database :: database()
 }).
 
 %% system

src/connection/mc_connection_man.erl

@@ -24,13 +24,14 @@
 read(Connection, Request) -> read(Connection, Request, undefined).
 
 -spec read(pid() | atom(), query(), undefined | mc_worker_api:batchsize()) -> [] | {ok, pid()}.
-read(Connection, Request = #'query'{collection = Collection, batchsize = BatchSize}, CmdBatchSize) ->
+read(Connection, Request = #'query'{collection = Collection, batchsize = BatchSize, database = DB}, CmdBatchSize) ->
   case request_worker(Connection, Request) of
     {_, []} ->
       [];
     {Cursor, Batch} ->
-      mc_cursor:start_link(Connection, Collection, Cursor, select_batchsize(CmdBatchSize, BatchSize), Batch)
+      mc_cursor:start_link(Connection, Collection, Cursor, select_batchsize(CmdBatchSize, BatchSize), Batch, DB)
   end.
+  
 
 -spec read_one(pid() | atom(), query()) -> undefined | map().
 read_one(Connection, Request) ->

src/connection/mc_cursor.erl

@@ -15,9 +15,11 @@
 ]).
 
 -export([
-  start_link/5
+  start_link/5,
+  start_link/6
 ]).
 
+
 -export([
   init/1,
   handle_call/3,
@@ -33,7 +35,8 @@
   cursor :: integer(),
   batchsize :: integer(),
   batch :: [bson:document()],
-  monitor :: reference()
+  monitor :: reference(),
+  database :: database()
 }).
 
 
@@ -111,19 +114,22 @@ close(Cursor) ->
   gen_server:cast(Cursor, halt).
 
 start_link(Connection, Collection, Cursor, BatchSize, Batch) ->
-  gen_server:start_link(?MODULE, [self(), Connection, Collection, Cursor, BatchSize, Batch], []).
+  gen_server:start_link(?MODULE, [self(), Connection, Collection, Cursor, BatchSize, Batch,undefined], []).
+start_link(Connection, Collection, Cursor, BatchSize, Batch, DB) ->
+  gen_server:start_link(?MODULE, [self(), Connection, Collection, Cursor, BatchSize, Batch,DB], []).
 
 
 %% @hidden
-init([Owner, Connection, Collection, Cursor, BatchSize, Batch]) ->
+init([Owner, Connection, Collection, Cursor, BatchSize, Batch,DB]) ->
   Monitor = erlang:monitor(process, Owner),
   {ok, #state{
     connection = Connection,
     collection = Collection,
     cursor = Cursor,
     batchsize = BatchSize,
     batch = format_batch(Batch),
-    monitor = Monitor
+    monitor = Monitor,
+	database = DB
   }}.
 
 %% @hidden
@@ -181,7 +187,8 @@ next_i(#state{batch = []} = State, Timeout) ->
     #getmore{
       collection = State#state.collection,
       batchsize = State#state.batchsize,
-      cursorid = State#state.cursor
+      cursorid = State#state.cursor,
+	  database = State#state.database
     },
     Timeout),
   Cursor = Reply#reply.cursorid,

src/connection/mc_worker.erl

@@ -217,8 +217,9 @@ get_set_opts_module(Options) ->
   end.
 
 %% @private
-get_database(#getmore{}, ConnState) -> ConnState#conn_state.database;
+get_database(#getmore{database = undefined}, ConnState) -> ConnState#conn_state.database;
 get_database(#query{database = undefined}, ConnState) -> ConnState#conn_state.database;
 get_database(#ensure_index{database = undefined}, ConnState) -> ConnState#conn_state.database;
+get_database(#getmore{database = DB}, _) -> DB;
 get_database(#query{database = DB}, _) -> DB;
 get_database(#ensure_index{database = DB}, _) -> DB.