Merge pull request #29 from zookzook/sessions

Add support for session and transaction

Author: zookzook

.travis.yml

@@ -2,20 +2,19 @@ sudo: required
 language: elixir
 
 elixir:
-  - 1.6
-  - 1.7
   - 1.8
+  - 1.9
 
 install:
   - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz
-  - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz
-  - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --version
+  - mkdir ${PWD}/mongodb
+  - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz --strip-components=1 -C ${PWD}/mongodb
 
 before_script:
-  - export PATH=${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/:$PATH
+  - export PATH=${PWD}/mongodb/bin/:$PATH
   - bash ./start_mongo.bash
-  - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data
-  - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork
+  - mkdir ${PWD}/mongodb/data
+  - ${PWD}/mongodb/bin/mongod --dbpath ${PWD}/mongodb/data --logpath ${PWD}/mongodb/mongodb.log --fork
 
 script:
   - mix local.hex --force
@@ -27,4 +26,4 @@ env:
     - MONGODB=3.2.20
     - MONGODB=3.4.16
     - MONGODB=3.6.6
-    - MONGODB=4.0.9
+    - MONGODB=ubuntu1604-v4.2-latest

CHANGELOG.md

@@ -1,3 +1,16 @@
+## 0.6.0
+
+* Enhancements
+    * refactored `writeConcern`
+    * refactored `filter_nils`
+    * refactored usage of `ReadPreference`
+    * added support for sessions (`ServerSession`, `SessionPool`, `Session`)
+    * added support for transaction
+    * added Decimal128 encoder
+    * added support for transaction to gridfs and bulk operation
+    * added `create` command (explicitly creating a collection or view)
+    
+    
 ## 0.5.7
 
 * Bug Fixes

README.md

@@ -22,14 +22,14 @@ for the individual options.
   * [x] Removed depreacated op codes ([See](https://docs.mongodb.com/manual/reference/mongodb-wire-protocol/#request-opcodes))
   * [x] Added `op_msg` support ([See](https://docs.mongodb.com/manual/reference/mongodb-wire-protocol/#op-msg))
   * [x] Added bulk writes ([See](https://github.com/mongodb/specifications/blob/master/source/crud/crud.rst#write))
-  * [ ] Add support for driver sessions ([See](https://github.com/mongodb/specifications/blob/master/source/sessions/driver-sessions.rst))
-  * [ ] Add support driver transactions ([See](https://github.com/mongodb/specifications/blob/master/source/transactions/transactions.rst))
+  * [x] Add support for driver sessions ([See](https://github.com/mongodb/specifications/blob/master/source/sessions/driver-sessions.rst))
+  * [x] Add support driver transactions ([See](https://github.com/mongodb/specifications/blob/master/source/transactions/transactions.rst))
   * [ ] Add support for `op_compressed` ([See](https://github.com/mongodb/specifications/blob/master/source/compression/OP_COMPRESSED.rst))
   * [ ] Because the driver is used in production environments, quick adjustments are necessary.
 
 ## Features
 
-  * Supports MongoDB versions 3.2, 3.4, 3.6, 4.0
+  * Supports MongoDB versions 3.2, 3.4, 3.6, 4.0, 4.2
   * Connection pooling ([through DBConnection 2.x](https://github.com/elixir-ecto/db_connection))
   * Streaming cursors
   * Performant ObjectID generation
@@ -57,6 +57,7 @@ for the individual options.
     symbol              "foo" (2)
     min key             :BSON_min
     max key             :BSON_max
+    decimal128          Decimal{}
 
 1) Since BSON documents are ordered Elixir maps cannot be used to fully represent them. This driver chose to accept both maps and lists of key-value pairs when encoding but will only decode documents to lists. This has the side-effect that it's impossible to discern empty arrays from empty documents. Additionally the driver will accept both atoms and strings for document keys but will only decode to strings.
 

config/config.exs

@@ -8,6 +8,12 @@ use Mix.Config
 # if you want to provide default values for your application for third-
 # party users, it should be done in your mix.exs file.
 
+config :logger, :console,
+  level: :info,
+  truncate: 1024,
+  format: "$time [$level] $message ($metadata)\n\n",
+  metadata: [:module, :function, :line]
+
 # Sample configuration:
 #
 #     config :logger, :console,

jetbrains.svg

@@ -1,4 +1,9 @@
 defmodule BSON.Decimal128 do
+
+  @moduledoc """
+    see https://en.wikipedia.org/wiki/Decimal128_floating-point_format
+  """
+
   use Bitwise
 
   @signed_bit_mask 1 <<< 63
@@ -7,13 +12,22 @@ defmodule BSON.Decimal128 do
   @combintation_nan 31
   @exponent_mask 0x3fff
   @exponent_bias 6176
+  @max_exponent 6111
+  @min_exponent -6176
+  @s_nan_mask  0x1 <<< 57
+  @significand_mask ((0x1 <<< 49)-1)
+  @low_mask 0xffffffffffffffff
 
   def decode(<<_::little-64, high::little-64>> = bits) do
     is_negative = (high &&& @signed_bit_mask) == (@signed_bit_mask)
     combination = (high >>> 58 &&& @combination_mask)
     two_highest_bits_set = combination >>> 3 == 3
     is_infinity = two_highest_bits_set && combination == @combintation_infinity
-    is_nan = two_highest_bits_set && combination == @combintation_nan
+    is_nan = case {(two_highest_bits_set && combination) == @combintation_nan, (high &&& @s_nan_mask) == @s_nan_mask} do
+      {true, true}  -> :sNan
+      {true, false} -> :qNan
+                  _ -> false
+    end
 
     exponent = exponent(high, two_highest_bits_set)
 
@@ -27,11 +41,52 @@ defmodule BSON.Decimal128 do
     )
   end
 
+  @doc """
+  s 11110 xx...x    ±infinity
+  s 11111 0x...x    a quiet NaN
+  s 11111 1x...x    a signalling NaN
+  """
+  def encode(%Decimal{sign: -1, coef: :inf}) do
+    low = 0
+    high = 0x3e <<< 58
+    <<low::little-64, high::little-64>>
+  end
+  def encode(%Decimal{coef: :inf}) do
+    low = 0
+    high = 0x1e <<< 58
+    <<low::little-64, high::little-64>>
+  end
+  def encode(%Decimal{coef: :qNaN}) do
+    low = 0
+    high = 0x1f <<< 58
+    <<low::little-64, high::little-64>>
+  end
+  def encode(%Decimal{coef: :sNaN}) do
+    low = 0
+    high = 0x3f <<< 57
+    <<low::little-64, high::little-64>>
+  end
+  def encode(%Decimal{sign: sign, coef: significand, exp: exponent}) when exponent >= @min_exponent and exponent <= @max_exponent do
+    biasedExponent = exponent + @exponent_bias
+    low  = significand &&& @low_mask
+    high = (significand >>> 64) &&& @significand_mask ## mask max significand
+    high = bor(high, biasedExponent <<< 49)
+    high = case sign do
+      1 -> high
+      _ -> bor(high, @signed_bit_mask)
+    end
+
+    <<low::little-64, high::little-64>>
+  end
+  def encode(%Decimal{exp: exponent}) do
+    message = "Exponent is out of range for Decimal128 encoding, #{exponent}"
+    raise ArgumentError, message
+  end
+
   defp exponent(high, _two_highest_bits_set = true) do
     biased_exponent = (high >>> 47) &&& @exponent_mask
     biased_exponent - @exponent_bias
   end
-
   defp exponent(high, _two_highest_bits_not_set) do
     biased_exponent = (high >>> 49) &&& @exponent_mask
     biased_exponent - @exponent_bias
@@ -40,23 +95,21 @@ defmodule BSON.Decimal128 do
   defp value(%{is_negative: true, is_infinity: true}, _, _) do
     %Decimal{sign: -1, coef: :inf}
   end
-
   defp value(%{is_negative: false, is_infinity: true}, _, _) do
     %Decimal{coef: :inf}
   end
-
-  defp value(%{is_nan: true}, _, _) do
+  defp value(%{is_nan: :qNan}, _, _) do
     %Decimal{coef: :qNaN}
   end
-
+  defp value(%{is_nan: :sNan}, _, _) do
+    %Decimal{coef: :sNaN}
+  end
   defp value(%{two_highest_bits_set: true}, _, _) do
     %Decimal{sign: 0, coef: 0, exp: 0}
   end
-
   defp value(%{is_negative: true}, coef, exponent) do
     %Decimal{sign: -1, coef: coef, exp: exponent}
   end
-
   defp value(_, coef, exponent) do
     %Decimal{coef: coef, exp: exponent}
   end

lib/bson/decimal128.ex

@@ -51,6 +51,10 @@ defmodule BSON.Encoder do
   def encode(%BSON.Timestamp{value: epoch, ordinal: ordinal}),
     do: <<ordinal::int32, epoch::int32>>
 
+  def encode(%BSON.LongNumber{value: value}), do: <<value::int64>>
+
+  def encode(%Decimal{} = value), do: BSON.Decimal128.encode(value)
+
   def encode([]) do
     document([])
   end
@@ -140,6 +144,8 @@ defmodule BSON.Encoder do
   defp type(%BSON.JavaScript{scope: nil}),  do: @type_js
   defp type(%BSON.JavaScript{}),            do: @type_js_scope
   defp type(%BSON.Timestamp{}),             do: @type_timestamp
+  defp type(%BSON.LongNumber{}),            do: @type_int64
+  defp type(%Decimal{}),                    do: @type_decimal128
   defp type(nil),                           do: @type_null
   defp type(:BSON_min),                     do: @type_min
   defp type(:BSON_max),                     do: @type_max

lib/bson/encoder.ex

@@ -151,9 +151,33 @@ defmodule BSON.Timestamp do
   @type t :: %__MODULE__{value: integer, ordinal: integer}
   defstruct [:value, :ordinal]
 
+  def is_after(this, that) do
+    (this.value > that.value or (this.value == that.value and this.ordinal > that.ordinal))
+  end
+
+  def is_before(this, that) do
+    (this.value < that.value or (this.value == that.value and this.ordinal < that.ordinal))
+  end
+
   defimpl Inspect do
     def inspect(%BSON.Timestamp{value: value, ordinal: ordinal}, _opts) do
       "#BSON.Timestamp<#{value}:#{ordinal}>"
     end
   end
 end
+
+defmodule BSON.LongNumber do
+  @moduledoc """
+  Represents BSON long type
+  """
+
+  @type t :: %__MODULE__{value: integer}
+
+  defstruct [value: 0]
+
+  defimpl Inspect do
+    def inspect(%BSON.LongNumber{value: value}, _opts) do
+      "#BSON.LongNumber<#{value}>"
+    end
+  end
+end