mongo 2.5.0.beta → 2.5.0

data/lib/mongo/error.rb

@@ -90,14 +90,17 @@ require 'mongo/error/invalid_replacement_document'
 require 'mongo/error/invalid_server_preference'
 require 'mongo/error/invalid_session'
 require 'mongo/error/invalid_signature'
+require 'mongo/error/invalid_txt_record'
 require 'mongo/error/invalid_update_document'
 require 'mongo/error/invalid_uri'
 require 'mongo/error/invalid_write_concern'
 require 'mongo/error/max_bson_size'
 require 'mongo/error/max_message_size'
+require 'mongo/error/mismatched_domain'
 require 'mongo/error/multi_index_drop'
 require 'mongo/error/need_primary_server'
 require 'mongo/error/no_server_available'
+require 'mongo/error/no_srv_records'
 require 'mongo/error/socket_error'
 require 'mongo/error/socket_timeout_error'
 require 'mongo/error/unchangeable_collection_option'

data/lib/mongo/error/invalid_txt_record.rb

@@ -0,0 +1,27 @@
+# Copyright (C) 2017 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Mongo
+  class Error
+
+    # This exception is raised when the URI Parser's query returns too many
+    #   TXT records or the record specifies invalid options.
+    #
+    # @example Instantiate the exception.
+    #   Mongo::Error::InvalidTXTRecord.new(message)
+    #
+    # @since 2.5.0
+    class InvalidTXTRecord < Error; end
+  end
+end

data/lib/mongo/error/invalid_uri.rb

@@ -24,14 +24,15 @@ module Mongo
       # Instantiate the new exception.
       #
       # @example Instantiate the exception.
-      #   Mongo::Error::InvalidURI.new(uri)
+      #   Mongo::Error::InvalidURI.new(uri, details, format)
       #
       # @since 2.0.0
-      def initialize(uri, details)
-        super("Bad URI: #{uri}\n" +
-        "#{details}\n" +
-        "MongoDB URI must be in the following format: #{Mongo::URI::FORMAT}\n" +
-        "Please see the following URL for more information: #{Mongo::URI::HELP}\n")
+      def initialize(uri, details, format = nil)
+        message = "Bad URI: #{uri}\n" +
+                    "#{details}\n"
+        message += "MongoDB URI must be in the following format: #{format}\n" if format
+        message += "Please see the following URL for more information: #{Mongo::URI::HELP}\n"
+        super(message)
       end
     end
   end

data/lib/mongo/error/mismatched_domain.rb

@@ -0,0 +1,27 @@
+# Copyright (C) 2017 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Mongo
+  class Error
+
+    # This exception is raised when the URI Parser's DNS query returns SRV record(s)
+    #   whose parent domain does not match the hostname used for the query.
+    #
+    # @example Instantiate the exception.
+    #   Mongo::Error::MismatchedDomain.new(message)
+    #
+    # @since 2.5.0
+    class MismatchedDomain < Error; end
+  end
+end

data/lib/mongo/error/no_srv_records.rb

@@ -0,0 +1,26 @@
+# Copyright (C) 2017 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Mongo
+  class Error
+
+    # This exception is raised when the URI Parser's DNS query returns no SRV records.
+    #
+    # @example Instantiate the exception.
+    #   Mongo::Error::NoSRVRecords.new(message)
+    #
+    # @since 2.5.0
+    class NoSRVRecords < Error; end
+  end
+end

data/lib/mongo/error/unsupported_features.rb

@@ -20,24 +20,6 @@ module Mongo
     #
     # @since 2.0.0
     class UnsupportedFeatures < Error
-
-      # Initialize the exception.
-      #
-      # @example Initialize the exception.
-      #   Unsupported.new(0..3)
-      #
-      # @param [ Range ] server_wire_versions The server's supported wire
-      #   versions.
-      #
-      # @since 2.0.0
-      def initialize(server_wire_versions)
-        super(
-          "This version of the driver, #{Mongo::VERSION}, only supports wire " +
-          "protocol versions #{Server::Description::Features::DRIVER_WIRE_VERSIONS} " +
-          "and the server supports wire versions #{server_wire_versions}. " + 
-          "Please upgrade the driver to be able to support this server version."
-        )
-      end
     end
   end
 end

data/lib/mongo/index/view.rb

@@ -157,7 +157,7 @@ module Mongo
                   session: session
                  }
           spec[:write_concern] = write_concern if server.features.collation_enabled?
-          Operation::Write::CreateIndex.new(spec).execute(server)
+          Operation::Write::Command::CreateIndex.new(spec).execute(server)
         end
       end
 
@@ -232,7 +232,7 @@ module Mongo
                  }
           server = next_primary
           spec[:write_concern] = write_concern if server.features.collation_enabled?
-          Operation::Write::DropIndex.new(spec).execute(server)
+          Operation::Write::Command::DropIndex.new(spec).execute(server)
         end
       end
 

data/lib/mongo/operation.rb

@@ -18,6 +18,7 @@ require 'mongo/operation/specifiable'
 require 'mongo/operation/limited'
 require 'mongo/operation/object_id_generator'
 require 'mongo/operation/uses_command_op_msg'
+require 'mongo/operation/causally_consistent'
 require 'mongo/operation/read_preference'
 require 'mongo/operation/takes_write_concern'
 require 'mongo/operation/read'

data/lib/mongo/operation/causally_consistent.rb

@@ -0,0 +1,33 @@
+# Copyright (C) 2017 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Mongo
+  module Operation
+
+    # Encapsulates behaviour for adding a causal consistency doc to the command.
+    #
+    # @since 2.5.0
+    module CausallyConsistent
+
+      private
+
+      def apply_causal_consistency!(selector, server)
+        if !server.standalone?
+          full_read_concern_doc = session.send(:causal_consistency_doc, selector[:readConcern])
+          selector[:readConcern] = full_read_concern_doc if full_read_concern_doc
+        end
+      end
+    end
+  end
+end

data/lib/mongo/operation/commands.rb

@@ -14,6 +14,8 @@
 
 require 'mongo/operation/commands/command'
 require 'mongo/operation/commands/find'
+require 'mongo/operation/commands/count'
+require 'mongo/operation/commands/distinct'
 require 'mongo/operation/commands/explain'
 require 'mongo/operation/commands/get_more'
 require 'mongo/operation/commands/parallel_scan'
@@ -26,5 +28,4 @@ require 'mongo/operation/commands/drop_database'
 require 'mongo/operation/commands/indexes'
 require 'mongo/operation/commands/list_collections'
 require 'mongo/operation/commands/list_indexes'
-require 'mongo/operation/commands/user_query'
 require 'mongo/operation/commands/users_info'

data/lib/mongo/operation/commands/aggregate.rb

@@ -41,17 +41,12 @@ module Mongo
       # @since 2.0.0
       class Aggregate < Command
         include TakesWriteConcern
+        include CausallyConsistent
 
         private
 
-        def filter_cursor_from_selector(sel, server)
-          return sel if server.features.write_command_enabled?
-          sel.reject{ |option, value| option.to_s == 'cursor' }
-        end
-
         def message(server)
-          sel = filter_cursor_from_selector(selector, server)
-          sel = update_selector_for_write_concern(sel, server)
+          sel = update_selector_for_write_concern(selector, server)
           if server.features.op_msg_enabled?
             command_op_msg(server, sel, options)
           else

data/lib/mongo/operation/commands/count.rb

@@ -0,0 +1,27 @@
+# Copyright (C) 2017 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Mongo
+  module Operation
+    module Commands
+
+      # Encapsulates behaviour for executing a count command.
+      #
+      # @since 2.5.0
+      class Count < Command
+        include CausallyConsistent
+      end
+    end
+  end
+end

data/lib/mongo/operation/commands/distinct.rb

@@ -0,0 +1,27 @@
+# Copyright (C) 2017 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Mongo
+  module Operation
+    module Commands
+
+      # Encapsulates behaviour for executing a distinct command.
+      #
+      # @since 2.5.0
+      class Distinct < Command
+        include CausallyConsistent
+      end
+    end
+  end
+end

data/lib/mongo/operation/commands/find.rb

@@ -19,7 +19,9 @@ module Mongo
       # Encapsulates behaviour for executing a find command.
       #
       # @since 2.2.0
-      class Find < Command; end
+      class Find < Command
+        include CausallyConsistent
+      end
     end
   end
 end

data/lib/mongo/operation/commands/map_reduce.rb

@@ -43,6 +43,7 @@ module Mongo
       # @since 2.0.0
       class MapReduce < Command
         include TakesWriteConcern
+        include CausallyConsistent
 
         private
 

data/lib/mongo/operation/commands/parallel_scan.rb

@@ -36,6 +36,7 @@ module Mongo
       #
       # @since 2.0.0
       class ParallelScan < Command
+        include CausallyConsistent
 
         private
 

data/lib/mongo/operation/specifiable.rb

@@ -514,6 +514,18 @@ module Mongo
       def session
         @spec[:session]
       end
+
+      # The transaction number for the operation.
+      #
+      # @example Get the transaction number.
+      #   specifiable.txn_num
+      #
+      # @return [ Integer ] The transaction number.
+      #
+      # @since 2.5.0
+      def txn_num
+        @spec[:txn_num]
+      end
     end
   end
 end

data/lib/mongo/operation/uses_command_op_msg.rb

@@ -22,23 +22,54 @@ module Mongo
 
       private
 
+      ZERO_TIMESTAMP = BSON::Timestamp.new(0,0)
+
       READ_PREFERENCE = '$readPreference'.freeze
 
-      def add_cluster_time!(selector, server)
-        if cluster_time = server.mongos? && server.cluster_time
-          selector[CLUSTER_TIME] = cluster_time
+      def apply_causal_consistency!(selector, server); end
+
+      def apply_cluster_time!(selector, server)
+        if !server.standalone?
+          cluster_time = [ server.cluster_time, (session && session.cluster_time) ].max_by do |doc|
+                            (doc && doc[Cluster::CLUSTER_TIME]) || ZERO_TIMESTAMP
+                          end
+
+          if cluster_time && (cluster_time[Cluster::CLUSTER_TIME] > ZERO_TIMESTAMP)
+            selector[CLUSTER_TIME] = cluster_time
+          end
         end
       end
 
+      def apply_session_id!(selector)
+        session.add_id!(selector) if session && !unacknowledged_write?
+      end
+
       def unacknowledged_write?
         write_concern && write_concern.get_last_error.nil?
       end
 
+      def update_selector_for_session!(selector, server)
+        # the driver MUST ignore any implicit session if at the point it is sending a command
+        # to a specific server it turns out that that particular server doesn't support sessions after all
+        if server.features.sessions_enabled?
+          apply_cluster_time!(selector, server)
+          selector[:txnNumber] = BSON::Int64.new(txn_num) if txn_num
+          if session
+            apply_session_id!(selector)
+            apply_causal_consistency!(selector, server)
+          end
+        elsif session && !session.send(:implicit_session?)
+          apply_cluster_time!(selector, server)
+          apply_session_id!(selector)
+          apply_causal_consistency!(selector, server)
+          selector[:txnNumber] = BSON::Int64.new(txn_num) if txn_num
+        end
+      end
+
       def command_op_msg(server, selector, options)
-        add_cluster_time!(selector, server)
+        update_selector_for_session!(selector, server)
         selector[Protocol::Msg::DATABASE_IDENTIFIER] = db_name
         selector[READ_PREFERENCE] = read.to_doc if read
-        session.add_id!(selector) if session
         flags = unacknowledged_write? ? [:more_to_come] : [:none]
         Protocol::Msg.new(flags, options, selector)
       end

data/lib/mongo/operation/write.rb

@@ -19,9 +19,4 @@ require 'mongo/operation/write/bulk'
 require 'mongo/operation/write/delete'
 require 'mongo/operation/write/insert'
 require 'mongo/operation/write/update'
-require 'mongo/operation/write/create_index'
-require 'mongo/operation/write/drop_index'
-require 'mongo/operation/write/create_user'
-require 'mongo/operation/write/update_user'
-require 'mongo/operation/write/remove_user'
 require 'mongo/operation/write/command'

data/lib/mongo/operation/write/bulk/bulkable.rb

@@ -35,14 +35,10 @@ module Mongo
           #
           # @since 2.0.0
           def execute(server)
-            if server.features.write_command_enabled?
-              result = execute_write_command(server)
-              server.update_cluster_time(result)
-              session.process(result) if session
-              result
-            else
-              execute_message(server)
-            end
+            result = execute_write_command(server)
+            server.update_cluster_time(result)
+            session.process(result) if session
+            result
           end
 
           private