Merge branch 'master' into sessions

Author: zookzook

CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.5.7
+
+* Bug Fixes
+   * Test for existing index in `Bucket` works right now
+
+* Enhancements
+   * Better handling for the `:timeout` options 
+
 ## 0.5.6
 
 * Bug Fixes

README.md

@@ -74,7 +74,7 @@ def application do
 end
 
 defp deps do
-  [{:mongodb_driver, "~> 0.5.3"}]
+  [{:mongodb_driver, "~> 0.5"}]
 end
 ```
 

lib/mongo/error.ex

@@ -14,12 +14,12 @@ defmodule Mongo.Error do
 
   def exception(tag: :tcp, action: action, reason: reason, host: host) do
     formatted_reason = :inet.format_error(reason)
-    %Mongo.Error{message: "#{host} tcp #{action}: #{formatted_reason} - #{inspect(reason)}"}
+    %Mongo.Error{message: "#{host} tcp #{action}: #{formatted_reason} - #{inspect(reason)}", host: host}
   end
 
   def exception(tag: :ssl, action: action, reason: reason, host: host) do
     formatted_reason = :ssl.format_error(reason)
-    %Mongo.Error{message: "#{host} ssl #{action}: #{formatted_reason} - #{inspect(reason)}"}
+    %Mongo.Error{message: "#{host} ssl #{action}: #{formatted_reason} - #{inspect(reason)}", host: host}
   end
 
   def exception(message: message, code: code) do

lib/mongo/grid_fs/bucket.ex

@@ -172,9 +172,13 @@ defmodule Mongo.GridFs.Bucket do
   end
 
   # returns true if the collection contains a index with the given name
-  defp index_member?(topology_pid, coll, index, opts) do
+  def index_member?(topology_pid, coll, index, opts) do
     topology_pid
     |> Mongo.list_indexes(coll, opts)
+    |> Enum.map(fn
+      %{"name" => name} -> name
+        _               -> ""
+       end)
     |> Enum.member?(index)
   end
 

lib/mongo/mongo_db_connection.ex

@@ -256,29 +256,28 @@ defmodule Mongo.MongoDBConnection do
   end
   defp execute_action(:command, [cmd], opts, %{wire_version: version} = state) when version >= 6 do
 
-    cmd = cmd ++ ["$db": opts[:database] || state.database,
-      "$readPreference": [mode: update_read_preferences(opts[:slave_ok])]]
-
-    timeout = Keyword.get(opts, :max_time, 0)
+    cmd = cmd ++ ["$db": opts[:database] || state.database, "$readPreference": [mode: update_read_preferences(opts[:slave_ok])]]
 
     # MongoDB 3.6 only allows certain command arguments to be provided this way. These are:
     op = case pulling_out?(cmd, :documents) || pulling_out?(cmd, :updates) || pulling_out?(cmd, :deletes) do
       nil -> op_msg(flags: 0, sections: [section(payload_type: 0, payload: payload(doc: cmd))])
       key -> pulling_out(cmd, key)
     end
 
-    with {:ok, doc} <- Utils.post_request(op, state.request_id, state, timeout),
+    # overwrite temporary timeout by timeout option
+    timeout = Keyword.get(opts, :timeout, state.timeout)
+
+    with {:ok, doc} <- Utils.post_request(op, state.request_id, %{state | timeout: timeout}),
          state = %{state | request_id: state.request_id + 1} do
       {:ok, doc, state}
     end
   end
   defp execute_action(:command, [cmd], opts, state) do
 
-    timeout = Keyword.get(opts, :max_time, 0)
-    flags   = Keyword.take(opts, @find_one_flags)
-    op      = op_query(coll: Utils.namespace("$cmd", state, opts[:database]), query: cmd, select: "", num_skip: 0, num_return: 1, flags: flags(flags))
-
-    with {:ok, doc} <- Utils.post_request(op, state.request_id, state, timeout),
+    flags    = Keyword.take(opts, @find_one_flags)
+    op       = op_query(coll: Utils.namespace("$cmd", state, opts[:database]), query: cmd, select: "", num_skip: 0, num_return: 1, flags: flags(flags))
+    timeout  = Keyword.get(opts, :timeout, state.timeout)
+    with {:ok, doc} <- Utils.post_request(op, state.request_id, %{state | timeout: timeout}),
          state = %{state | request_id: state.request_id + 1}  do
       {:ok, doc, state}
     end

lib/mongo_db_connection/utils.ex

@@ -13,10 +13,10 @@ defmodule Mongo.MongoDBConnection.Utils do
     Sends a request id and waits for the response with the same id
 
   """
-  def post_request(op, id, state, timeout \\ 0) do
+  def post_request(op, id, state) do
 
     with :ok <- send_data(encode(id, op), state),
-         {:ok, ^id, response} <- recv_data(nil, "", state, timeout),
+         {:ok, ^id, response} <- recv_data(nil, "", state),
          {:ok, doc} <- get_doc(response),
          do: {:ok, doc}
   end
@@ -39,7 +39,7 @@ defmodule Mongo.MongoDBConnection.Utils do
     command = command ++ ["$db": db]
 
     op_msg(flags: 0, sections: [section(payload_type: 0, payload: payload(doc: command))])
-    |> post_request(id, state, 0)
+    |> post_request(id, state)
 
   end
   def command(id, command, state)  do
@@ -52,7 +52,7 @@ defmodule Mongo.MongoDBConnection.Utils do
     end
 
     op_query(coll: ns, query: command, select: "", num_skip: 0, num_return: 1, flags: [])
-    |> post_request(id, state, 0)
+    |> post_request(id, state)
 
   end
 
@@ -84,28 +84,28 @@ defmodule Mongo.MongoDBConnection.Utils do
     end
   end
 
-  defp recv_data(nil, "", %{connection: {mod, socket}} = state, timeout) do
-    case mod.recv(socket, 0, timeout + state.timeout) do
-      {:ok, tail}      -> recv_data(nil, tail, state, timeout)
+  defp recv_data(nil, "", %{connection: {mod, socket}} = state) do
+    case mod.recv(socket, 0, state.timeout) do
+      {:ok, tail}      -> recv_data(nil, tail, state)
       {:error, reason} -> recv_error(reason, state)
     end
   end
-  defp recv_data(nil, data, %{connection: {mod, socket}} = state, timeout) do
+  defp recv_data(nil, data, %{connection: {mod, socket}} = state) do
     case decode_header(data) do
-      {:ok, header, rest} -> recv_data(header, rest, state, timeout)
+      {:ok, header, rest} -> recv_data(header, rest, state)
       :error ->
-        case mod.recv(socket, 0, timeout + state.timeout) do
-          {:ok, tail}      -> recv_data(nil, [data|tail], state, timeout)
+        case mod.recv(socket, 0, state.timeout) do
+          {:ok, tail}      -> recv_data(nil, [data|tail], state)
           {:error, reason} -> recv_error(reason, state)
         end
     end
   end
-  defp recv_data(header, data, %{connection: {mod, socket}} = state, timeout) do
+  defp recv_data(header, data, %{connection: {mod, socket}} = state) do
     case decode_response(header, data) do
       {:ok, id, reply, ""} -> {:ok, id, reply}
       :error ->
-        case mod.recv(socket, 0, timeout + state.timeout) do
-          {:ok, tail}      -> recv_data(header, [data|tail], state, timeout)
+        case mod.recv(socket, 0, state.timeout) do
+          {:ok, tail}      -> recv_data(header, [data|tail], state)
           {:error, reason} -> recv_error(reason, state)
         end
     end

mix.exs

@@ -1,7 +1,7 @@
 defmodule Mongodb.Mixfile do
   use Mix.Project
 
-  @version "0.5.6"
+  @version "0.5.7"
 
   def project() do
     [app: :mongodb_driver,