Merge pull request #1 from zookzook/DBConnection-Upgrade

Db connection upgrade

Author: zookzook

CHANGELOG.md

@@ -1,3 +1,10 @@
+## v0.5.0-dev
+
+* Enhancements
+  * upgraded to DBConnection 2.0.6
+  * Refactored code
+  * replaced deprecated op_code by database commands
+
 ## v0.4.8-dev
 
 * Enhancements

lib/mongo.ex

@@ -167,7 +167,7 @@ defmodule Mongo do
 
     with {:ok, conn, slave_ok, _} <- select_server(topology_pid, :read, opts),
           opts = Keyword.put(opts, :slave_ok, slave_ok),
-         {:ok, version} <- DBConnection.execute(conn, wv_query, [], defaults(opts)) do
+         {:ok, _query, version} <- DBConnection.execute(conn, wv_query, [], defaults(opts)) do
       cursor? = version >= 1 and Keyword.get(opts, :use_cursor, true)
       opts = Keyword.drop(opts, ~w(allow_disk_use max_time use_cursor)a)
 
@@ -530,7 +530,7 @@ defmodule Mongo do
     params = [query]
     query = %Query{action: :command}
 
-    with {:ok, response} <- DBConnection.execute(conn, query, params, defaults(opts)) do
+    with {:ok, _query, response} <- DBConnection.execute(conn, query, params, defaults(opts)) do
       case response do
         op_reply(flags: flags, docs: [%{"$err" => reason, "code" => code}]) when (@reply_query_failure &&& flags) != 0  -> {:error, Mongo.Error.exception(message: reason, code: code)}
         op_reply(flags: flags) when (@reply_cursor_not_found &&& flags) != 0 ->  {:error, Mongo.Error.exception(message: "cursor not found")}

lib/mongo/mongo_db_connection.ex

@@ -11,6 +11,7 @@ defmodule Mongo.MongoDBConnection do
   @find_one_flags ~w(slave_ok exhaust partial)a
   @write_concern  ~w(w j wtimeout)a
 
+  @impl true
   def connect(opts) do
     {write_concern, opts} = Keyword.split(opts, @write_concern)
     write_concern = Keyword.put_new(write_concern, :w, 1)
@@ -32,6 +33,7 @@ defmodule Mongo.MongoDBConnection do
     connect(opts, state)
   end
 
+  @impl true
   def disconnect(_error, %{socket: {mod, sock}} = state) do
     notify_disconnect(state)
     mod.close(sock)
@@ -42,6 +44,7 @@ defmodule Mongo.MongoDBConnection do
   end
 
   defp connect(opts, state) do
+
     result =
       with {:ok, state} <- tcp_connect(opts, state),
            {:ok, state} <- maybe_ssl(opts, state),
@@ -52,7 +55,7 @@ defmodule Mongo.MongoDBConnection do
 
     case result do
       {:ok, state} ->
-        #IO.puts inspect state
+        IO.puts inspect state
         {:ok, state}
 
       {:disconnect, reason, state} ->
@@ -65,7 +68,7 @@ defmodule Mongo.MongoDBConnection do
         mod.close(sock)
         {:error, reason}
 
-      {:error, reason} ->  {:error, reason}
+      {:error, reason} -> {:error, reason}
     end
   end
 
@@ -125,17 +128,45 @@ defmodule Mongo.MongoDBConnection do
     end
   end
 
+  @impl true
   def checkout(state), do: {:ok, state}
+  @impl true
   def checkin(state), do: {:ok, state}
 
+  @impl true
+  def handle_begin(opts, state), do: {:ok, nil, state}
+  @impl true
+  def handle_close(query, opts, state), do: {:ok, nil, state}
+  @impl true
+  def handle_commit(opts, state), do: {:ok, nil, state}
+  @impl true
+  def handle_deallocate(query, cursor, opts, state), do:  {:ok, nil, state}
+  @impl true
+  def handle_declare(query, params, opts, state), do: {:ok, query, nil, state}
+  @impl true
+  def handle_fetch(query, cursor, opts, state), do: {:halt, nil, state}
+  @impl true
+  def handle_prepare(query, opts, state), do: {:ok, query, state}
+  @impl true
+  def handle_rollback(opts, state), do: {:ok, nil, state}
+  @impl true
+  def handle_status(opts, state), do: {:idle, state}
+
+  @impl true
+  def ping(%{wire_version: wire_version} = state) do
+    with {:ok, %{wire_version: ^wire_version}} <- wire_version(state), do: {:ok, state}
+  end
+
+
   def handle_execute_close(query, params, opts, s) do
     handle_execute(query, params, opts, s)
   end
 
-  def handle_execute(%Mongo.Query{action: action, extra: extra}, params, opts, original_state) do
+  @impl true
+  def handle_execute(%Mongo.Query{action: action, extra: extra} = query, params, opts, original_state) do
     tmp_state = %{original_state | database: Keyword.get(opts, :database, original_state.database)}
     with {:ok, reply, tmp_state} <- handle_execute(action, extra, params, opts, tmp_state) do
-      {:ok, reply, Map.put(tmp_state, :database, original_state.database)}
+      {:ok, query, reply, Map.put(tmp_state, :database, original_state.database)}
     end
   end
 
@@ -162,8 +193,5 @@ defmodule Mongo.MongoDBConnection do
     end)
   end
 
-  def ping(%{wire_version: wire_version} = state) do
-    with {:ok, %{wire_version: ^wire_version}} <- wire_version(state), do: {:ok, state}
-  end
 
 end

lib/mongo/monitor.ex

@@ -42,6 +42,7 @@ defmodule Mongo.Monitor do
       |> Keyword.put(:backoff_type, :rand)
       |> Keyword.put(:connection_type, :monitor)
       |> Keyword.put(:topology_pid, topology_pid)
+      |> Keyword.put(:pool_size, 1)
 
     {:ok, pid} = DBConnection.start_link(Mongo.MongoDBConnection, opts)
     :ok = GenServer.cast(self(), :check)
@@ -103,8 +104,7 @@ defmodule Mongo.Monitor do
     result = try do
       Mongo.direct_command(conn_pid, %{isMaster: 1}, opts)
     rescue
-      e ->
-        {:error, e}
+      e -> {:error, e}
     end
     finish_time = System.monotonic_time
     rtt = System.convert_time_unit(finish_time - start_time, :native, :millisecond)

lib/mongo/topology.ex

@@ -231,7 +231,7 @@ defmodule Mongo.Topology do
         server_description,
         self(),
         @heartbeat_frequency_ms,
-        Keyword.put(connopts, :pool, DBConnection.Connection)
+        Keyword.put(connopts, :pool, DBConnection.ConnectionPool)
       ]
 
       :ok = Mongo.Events.notify(%ServerOpeningEvent{address: address, topology_pid: self()})

mix.exs

@@ -1,14 +1,14 @@
 defmodule Mongodb.Mixfile do
   use Mix.Project
 
-  @version "0.4.7"
+  @version "0.5.0"
 
-  def project do
-    [app: :mongodb,
+  def project() do
+    [app: :mongodb_driver,
      version: @version,
      elixirc_paths: elixirc_paths(Mix.env),
      elixir: "~> 1.4",
-     name: "Mongodb",
+     name: "mongodb-driver",
      deps: deps(),
      docs: docs(),
      description: description(),
@@ -25,7 +25,7 @@ defmodule Mongodb.Mixfile do
   defp elixirc_paths(:test), do: ["lib", "test/support"]
   defp elixirc_paths(_),     do: ["lib"]
 
-  def application do
+  def application() do
     [applications: applications(Mix.env),
      mod: {Mongo.App, []},
      env: []]
@@ -34,33 +34,32 @@ defmodule Mongodb.Mixfile do
   def applications(:test), do: [:logger, :connection, :db_connection]
   def applications(_), do: [:logger, :connection, :db_connection]
 
-  defp deps do
+  defp deps() do
     [
       {:connection,    "~> 1.0"},
-      {:db_connection, "~> 1.1"},
+      {:db_connection, "~> 2.0.6"},
       {:decimal,       "~> 1.0"},
-      {:poolboy,       ">= 0.0.0", only: :test},
       {:jason,         "~> 1.0.0", only: :test},
-      {:ex_doc,        ">= 0.0.0", only: :dev},
+      {:ex_doc,        "~> 0.20.1 ", only: :dev},
       {:earmark,       ">= 0.0.0", only: :dev},
       {:dialyxir, "~> 1.0.0-rc.4", only: [:dev], runtime: false}
     ]
   end
 
-  defp docs do
+  defp docs() do
     [main: "readme",
      extras: ["README.md"],
      source_ref: "v#{@version}",
-     source_url: "https://github.com/ankhers/mongodb"]
+     source_url: "https://github.com/zookzook/elixir-mongodb-driver"]
   end
 
-  defp description do
-    "MongoDB driver for Elixir"
+  defp description() do
+    "An alternative MongoDB driver for Elixir"
   end
 
-  defp package do
-    [maintainers: ["Eric Meadows-Jönsson", "Justin Wood"],
+  defp package() do
+    [maintainers: ["Michael Maier"],
      licenses: ["Apache 2.0"],
-     links: %{"GitHub" => "https://github.com/ankhers/mongodb"}]
+     links: %{"GitHub" => "https://github.com/zookzook/elixir-mongodb-driver"}]
   end
 end

mix.lock

@@ -1,11 +1,14 @@
 %{
   "connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], [], "hexpm"},
-  "db_connection": {:hex, :db_connection, "1.1.3", "89b30ca1ef0a3b469b1c779579590688561d586694a3ce8792985d4d7e575a61", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}, {:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: true]}, {:sbroker, "~> 1.0", [hex: :sbroker, repo: "hexpm", optional: true]}], "hexpm"},
+  "db_connection": {:hex, :db_connection, "2.0.6", "bde2f85d047969c5b5800cb8f4b3ed6316c8cb11487afedac4aa5f93fd39abfa", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}], "hexpm"},
   "decimal": {:hex, :decimal, "1.5.0", "b0433a36d0e2430e3d50291b1c65f53c37d56f83665b43d79963684865beab68", [:mix], [], "hexpm"},
   "dialyxir": {:hex, :dialyxir, "1.0.0-rc.4", "71b42f5ee1b7628f3e3a6565f4617dfb02d127a0499ab3e72750455e986df001", [:mix], [{:erlex, "~> 0.1", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm"},
-  "earmark": {:hex, :earmark, "1.2.4", "99b637c62a4d65a20a9fb674b8cffb8baa771c04605a80c911c4418c69b75439", [:mix], [], "hexpm"},
+  "earmark": {:hex, :earmark, "1.3.2", "b840562ea3d67795ffbb5bd88940b1bed0ed9fa32834915125ea7d02e35888a5", [:mix], [], "hexpm"},
   "erlex": {:hex, :erlex, "0.1.6", "c01c889363168d3fdd23f4211647d8a34c0f9a21ec726762312e08e083f3d47e", [:mix], [], "hexpm"},
-  "ex_doc": {:hex, :ex_doc, "0.18.1", "37c69d2ef62f24928c1f4fdc7c724ea04aecfdf500c4329185f8e3649c915baf", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}], "hexpm"},
+  "ex_doc": {:hex, :ex_doc, "0.20.1", "88eaa16e67c505664fd6a66f42ddb962d424ad68df586b214b71443c69887123", [:mix], [{:earmark, "~> 1.3", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.10", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
   "jason": {:hex, :jason, "1.0.0", "0f7cfa9bdb23fed721ec05419bcee2b2c21a77e926bce0deda029b5adc716fe2", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm"},
-  "poolboy": {:hex, :poolboy, "1.5.1", "6b46163901cfd0a1b43d692657ed9d7e599853b3b21b95ae5ae0a777cf9b6ca8", [:rebar], [], "hexpm"},
+  "makeup": {:hex, :makeup, "0.8.0", "9cf32aea71c7fe0a4b2e9246c2c4978f9070257e5c9ce6d4a28ec450a839b55f", [:mix], [{:nimble_parsec, "~> 0.5.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"},
+  "makeup_elixir": {:hex, :makeup_elixir, "0.13.0", "be7a477997dcac2e48a9d695ec730b2d22418292675c75aa2d34ba0909dcdeda", [:mix], [{:makeup, "~> 0.8", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm"},
+  "nimble_parsec": {:hex, :nimble_parsec, "0.5.0", "90e2eca3d0266e5c53f8fbe0079694740b9c91b6747f2b7e3c5d21966bba8300", [:mix], [], "hexpm"},
+  "poolboy": {:hex, :poolboy, "1.5.2", "392b007a1693a64540cead79830443abf5762f5d30cf50bc95cb2c1aaafa006b", [:rebar3], [], "hexpm"},
 }

test/mongo/connection_test.exs

@@ -73,10 +73,10 @@ defmodule Mongo.ConnectionTest do
             username: "mongodb_user", password: "wrong",
             backoff_type: :stop]
 
-    capture_log fn ->
-      assert {:ok, pid} = Mongo.start_link(opts)
-      assert_receive {:EXIT, ^pid, {%Mongo.Error{code: 18}, _}}
-    end
+    assert capture_log(fn ->
+       {:ok, pid} = Mongo.start_link(opts)
+       assert_receive {:EXIT, ^pid, :killed}, 5000
+    end)
   end
 
   test "auth wrong on db" do
@@ -86,10 +86,10 @@ defmodule Mongo.ConnectionTest do
             username: "mongodb_admin_user", password: "wrong",
             backoff_type: :stop, auth_source: "admin_test"]
 
-    capture_log fn ->
-      assert {:ok, pid} = Mongo.start_link(opts)
-      assert_receive {:EXIT, ^pid, {%Mongo.Error{code: 18}, _}}
-    end
+    assert capture_log(fn ->
+       {:ok, pid} = Mongo.start_link(opts)
+       assert_receive {:EXIT, ^pid, :killed}, 5000
+     end)
   end
 
   test "insert_one flags" do