github-migration/mongo-ruby-driver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed three unused methods from Connection

Browse Source
This commit is contained in:
Kyle Banker 2010-12-15 12:41:33 -05:00
parent 9ea8fe98b7
commit 7ee45f4340
1 changed files with 6 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
lib/mongo/connection.rb
View File

@ -540,25 +540,10 @@ module Mongo
end end
end end
# Convert an argument containing a host name string and a
# port number integer into a [host, port] pair array.
#
# @private
def pair_val_to_connection(a)
case a
when nil
['localhost', DEFAULT_PORT]
when String
[a, DEFAULT_PORT]
when Integer
['localhost', a]
when Array
a
end
end
private private
## Methods for establishing a connection:
# If a ConnectionFailure is raised, this method will be called # If a ConnectionFailure is raised, this method will be called
# to close the connection and reset connection values. # to close the connection and reset connection values.
# TODO: evaluate whether this method is actually necessary # TODO: evaluate whether this method is actually necessary
@ -630,17 +615,6 @@ module Mongo
nil nil
end end
# This is an optimized version of receive_header
# TODO: modify this to check response_id
def receive_and_discard_header(sock)
bytes_read = receive_and_discard_message_on_socket(16, sock)
unless bytes_read == STANDARD_HEADER_SIZE
raise "Short read for DB response header: " +
"expected #{STANDARD_HEADER_SIZE} bytes, saw #{bytes_read}"
end
nil
end
def receive_response_header(sock) def receive_response_header(sock)
header_buf = receive_message_on_socket(RESPONSE_HEADER_SIZE, sock) header_buf = receive_message_on_socket(RESPONSE_HEADER_SIZE, sock)
if header_buf.length != RESPONSE_HEADER_SIZE if header_buf.length != RESPONSE_HEADER_SIZE
@ -677,6 +651,8 @@ module Mongo
# Constructs a getlasterror message. This method is used exclusively by # Constructs a getlasterror message. This method is used exclusively by
# Connection#send_message_with_safe_check. # Connection#send_message_with_safe_check.
#
# Because it modifies message by reference, we don't need to return it.
def build_last_error_message(message, db_name, opts) def build_last_error_message(message, db_name, opts)
message.put_int(0) message.put_int(0)
BSON::BSON_RUBY.serialize_cstr(message, "#{db_name}.$cmd") BSON::BSON_RUBY.serialize_cstr(message, "#{db_name}.$cmd")
@ -695,6 +671,8 @@ module Mongo
# Prepares a message for transmission to MongoDB by # Prepares a message for transmission to MongoDB by
# constructing a valid message header. # constructing a valid message header.
# #
# Note: this method modifies message by reference.
#
# @returns [Integer] the request id used in the header # @returns [Integer] the request id used in the header
def add_message_headers(message, operation) def add_message_headers(message, operation)
headers = [ headers = [
@ -770,29 +748,6 @@ module Mongo
message message
end end
# Low-level data for receiving data from socket.
# Unlike #receive_message_on_socket, this method immediately discards the data
# and only returns the number of bytes read.
def receive_and_discard_message_on_socket(length, socket)
bytes_read = 0
begin
chunk = socket.read(length)
bytes_read = chunk.length
raise ConnectionFailure, "connection closed" unless bytes_read > 0
if bytes_read < length
while bytes_read < length
socket.read(length - bytes_read, chunk)
raise ConnectionFailure, "connection closed" unless chunk.length > 0
bytes_read += chunk.length
end
end
rescue => ex
close
raise ConnectionFailure, "Operation failed with the following exception: #{ex}"
end
bytes_read
end
if defined?(Encoding) if defined?(Encoding)
BINARY_ENCODING = Encoding.find("binary") BINARY_ENCODING = Encoding.find("binary")