rethinkdb 1.15.0.0 → 1.16.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96b7e6356ef15d865bb29f59a0c84b164cbfa2ea
-  data.tar.gz: 709661d9216eb7483aa08b99439b7d23e8f7cd68
+  metadata.gz: a1794895a9ff42acedd81e8a39670e7ebdbcda21
+  data.tar.gz: 7eb72083c471ad5e32cbbbd02dbc403d897db87c
 SHA512:
-  metadata.gz: d1b85c8b33bbe60a95b14c2f8f1a33b78e732da55065db74c860f3fd724033c799f064ad4245b4a7b866b8193c2550d4f0f46277477f3baabd422251b8adc17a
-  data.tar.gz: fbd57d77ef74bb44651176827a42f5415bc7747303202980de56123eb77d2f041fd26161fd86a0215cbac0ab6b550d2729928effd03364ab39fa7db7f0b7003a
+  metadata.gz: 0c089f1c39bbaeaf3b467cd7601db23e7558e38933497fb178e00916d3000281defaf4c05cb28ee7766274c31e8d9b163091e8975028fdde5e75d83e10014313
+  data.tar.gz: e5acd237522ca83acb6f6302cf35359599c9adb6dfcc43a6f43d6684dc012b3e6c8ff8542d73ac73dd4e63774678b4b606e3685657f42211b29d229525d9c983

data/lib/func.rb

@@ -25,6 +25,7 @@ module RethinkDB
       :between => 2,
       :table => -1,
       :table_create => -1,
+      :reconfigure => 0,
       :get_all => -1,
       :eq_join => -1,
       :javascript => -1,
@@ -32,6 +33,7 @@ module RethinkDB
       :slice => -1,
       :during => -1,
       :orderby => -1,
+      :order_by => -1,
       :group => -1,
       :iso8601 => -1,
       :index_create => -1,
@@ -42,7 +44,11 @@ module RethinkDB
       :distance => -1,
       :circle => -1,
       :get_intersecting => -1,
-      :get_nearest => -1
+      :get_nearest => -1,
+      :min => -1,
+      :max => -1,
+      :changes => -1,
+      :wait => 0
     }
     @@method_aliases = {
       :lt => :<,
@@ -56,11 +62,11 @@ module RethinkDB
       :mod => :%,
       :any => [:"|", :or],
       :all => [:"&", :and],
-      :orderby => :order_by,
-      :concatmap => :concat_map,
-      :foreach => :for_each,
+      :order_by => :orderby,
+      :concat_map => :concatmap,
+      :for_each => :foreach,
       :javascript => :js,
-      :typeof => :type_of
+      :type_of => :typeof
     }
 
     termtypes = Term::TermType.constants.map{ |c| c.to_sym }

data/lib/net.rb

@@ -1,6 +1,7 @@
 require 'socket'
 require 'thread'
 require 'timeout'
+require 'pp' # This is needed for pretty_inspect
 
 module RethinkDB
   module Faux_Abort
@@ -13,8 +14,8 @@ module RethinkDB
     def self.set_default_conn c; @@default_conn = c; end
     def run(c=@@default_conn, opts=nil, &b)
       unbound_if(@body == RQL)
-      c, opts = @@default_conn, c if opts.nil? && !c.kind_of?(RethinkDB::Connection)
-      opts = {} if opts.nil?
+      c, opts = @@default_conn, c if !opts && !c.kind_of?(RethinkDB::Connection)
+      opts = {} if !opts
       opts = {opts => true} if opts.class != Hash
       if (tf = opts[:time_format])
         opts[:time_format] = (tf = tf.to_s)
@@ -45,17 +46,17 @@ module RethinkDB
   class Cursor
     include Enumerable
     def out_of_date # :nodoc:
-      @conn.conn_id != @conn_id
+      @conn.conn_id != @conn_id || !@conn.is_open()
     end
 
     def inspect # :nodoc:
       preview_res = @results[0...10]
-      if (@results.size > 10 || @more)
+      if @results.size > 10 || @more
         preview_res << (dots = "..."; class << dots; def inspect; "..."; end; end; dots)
       end
       preview = preview_res.pretty_inspect[0...-1]
       state = @run ? "(exhausted)" : "(enumerable)"
-      extra = out_of_date ? " (Connection #{@conn.inspect} reset!)" : ""
+      extra = out_of_date ? " (Connection #{@conn.inspect} is closed.)" : ""
       "#<RethinkDB::Cursor:#{self.object_id} #{state}#{extra}: #{RPP.pp(@msg)}" +
         (@run ? "" : "\n#{preview}") + ">"
     end
@@ -73,12 +74,13 @@ module RethinkDB
     end
 
     def each (&block) # :nodoc:
-      raise RqlRuntimeError, "Can only iterate over Query_Results once!" if @run
+      raise RqlRuntimeError, "Can only iterate over a cursor once." if @run
+      return self.enum_for(:each) if !block
       @run = true
-      raise RqlRuntimeError, "Connection has been reset!" if out_of_date
       while true
         @results.each(&block)
         return self if !@more
+        raise RqlRuntimeError, "Connection is closed." if @more && out_of_date
         res = @conn.wait(@token)
         @results = Shim.response_to_native(res, @msg, @opts)
         if res['t'] == Response::ResponseType::SUCCESS_SEQUENCE
@@ -92,9 +94,13 @@ module RethinkDB
     def close
       if @more
         @more = false
+        @conn.wait(@token) # Ignore the response - TODO: do this asynchronously
         q = [Query::QueryType::STOP]
         res = @conn.run_internal(q, @opts, @token)
-        if res['t'] != Response::ResponseType::SUCCESS_SEQUENCE || res.response != []
+        if ((res['t'] != Response::ResponseType::SUCCESS_SEQUENCE &&
+             res['t'] != Response::ResponseType::SUCCESS_FEED &&
+             res['t'] != Response::ResponseType::SUCCESS_ATOM_FEED) ||
+            res['r'] != [])
           raise RqlRuntimeError, "Server sent malformed STOP response #{PP.pp(res, "")}"
         end
         return true
@@ -102,7 +108,7 @@ module RethinkDB
     end
 
     def fetch_batch
-      @conn.set_opts(@token, @opts)
+      @conn.register_query(@token, @opts)
       @conn.dispatch([Query::QueryType::CONTINUE], @token)
     end
   end
@@ -134,7 +140,7 @@ module RethinkDB
       @token_cnt = 0
       @token_cnt_mutex = Mutex.new
 
-      reconnect(:noreply_wait => false)
+      self.connect()
     end
     attr_reader :host, :port, :default_db, :conn_id
 
@@ -142,19 +148,24 @@ module RethinkDB
       @token_cnt_mutex.synchronize{@token_cnt += 1}
     end
 
-    def set_opts(token, opts)
-      @mutex.synchronize{@opts[token] = opts}
+    def register_query(token, opts)
+      if !opts[:noreply]
+        @listener_mutex.synchronize{
+          raise RqlDriverError, "Internal driver error, token already in use." \
+            if @waiters.has_key?(token)
+          @waiters[token] = ConditionVariable.new
+          @opts[token] = opts
+        }
+      end
     end
     def run_internal(q, opts, token)
-      set_opts(token, opts)
-      noreply = opts[:noreply]
-
+      register_query(token, opts)
       dispatch(q, token)
-      noreply ? nil : wait(token)
+      opts[:noreply] ? nil : wait(token)
     end
     def run(msg, opts, &b)
-      reconnect(:noreply_wait => false) if @auto_reconnect && (!@socket || !@listener)
-      raise RqlRuntimeError, "Error: Connection Closed." if !@socket || !@listener
+      reconnect(:noreply_wait => false) if @auto_reconnect && !self.is_open()
+      raise RqlRuntimeError, "Connection is closed." if !self.is_open()
 
       global_optargs = {}
       all_opts = @default_opts.merge(opts)
@@ -172,7 +183,8 @@ module RethinkDB
       res = run_internal(q, all_opts, token)
       return res if !res
       if res['t'] == Response::ResponseType::SUCCESS_PARTIAL ||
-          res['t'] == Response::ResponseType::SUCCESS_FEED
+         res['t'] == Response::ResponseType::SUCCESS_FEED ||
+         res['t'] == Response::ResponseType::SUCCESS_ATOM_FEED
         value = Cursor.new(Shim.response_to_native(res, msg, opts),
                            msg, self, opts, token, true)
       elsif res['t'] == Response::ResponseType::SUCCESS_SEQUENCE
@@ -213,15 +225,20 @@ module RethinkDB
       return token
     end
 
-    def wait token
+    def wait(token)
       begin
         res = nil
-        raise RqlRuntimeError, "Connection closed by server!" if not @listener
-        @mutex.synchronize {
-          (@waiters[token] = ConditionVariable.new).wait(@mutex) if not @data[token]
-          res = @data.delete token if @data[token]
+        @listener_mutex.synchronize {
+          raise RqlRuntimeError, "Connection is closed." if !@waiters.has_key?(token)
+          res = @data.delete(token)
+          if res == nil
+            @waiters[token].wait(@listener_mutex)
+            res = @data.delete(token)
+          end
+          @waiters.delete(token)
         }
-        raise RqlRuntimeError, "Connection closed by server!" if !@listener or !res
+        raise RqlRuntimeError, "Connection is closed." if res.nil? && !self.is_open()
+        raise RqlDriverError, "Internal driver error, no response found." if res.nil?
         return res
       rescue @abort_module::Abort => e
         print "\nAborting query and reconnecting...\n"
@@ -239,7 +256,7 @@ module RethinkDB
     def inspect
       db = @default_opts[:db] || RQL.new.db('test')
       properties = "(#{@host}:#{@port}) (Default DB: #{db.inspect})"
-      state = @listener ? "(listening)" : "(closed)"
+      state = self.is_open() ? "(open)" : "(closed)"
       "#<RethinkDB::Connection:#{self.object_id} #{properties} #{state}>"
     end
 
@@ -254,44 +271,53 @@ module RethinkDB
     # enumerables on the client.
     def reconnect(opts={})
       raise ArgumentError, "Argument to reconnect must be a hash." if opts.class != Hash
-      if not (opts.keys - [:noreply_wait]).empty?
-        raise ArgumentError, "reconnect does not understand these options: " +
-          (opts.keys - [:noreply_wait]).to_s
-      end
-      opts[:noreply_wait] = true if not opts.keys.include?(:noreply_wait)
-
-      self.noreply_wait() if opts[:noreply_wait]
+      self.close(opts)
+      self.connect()
+    end
 
-      stop_listener
-      @socket.close rescue nil if @socket
+    def connect()
+      raise RuntimeError, "Connection must be closed before calling connect." if @socket
       @socket = TCPSocket.open(@host, @port)
+      @listener_mutex = Mutex.new
       @waiters = {}
       @opts = {}
       @data = {}
-      @mutex = Mutex.new
       @conn_id += 1
       start_listener
-
       self
     end
 
+    def is_open()
+      @socket && @listener
+    end
+
     def close(opts={})
       raise ArgumentError, "Argument to close must be a hash." if opts.class != Hash
-      if not (opts.keys - [:noreply_wait]).empty?
+      if !(opts.keys - [:noreply_wait]).empty?
         raise ArgumentError, "close does not understand these options: " +
           (opts.keys - [:noreply_wait]).to_s
       end
-      opts[:noreply_wait] = true if not opts.keys.include?(:noreply_wait)
+      opts[:noreply_wait] = true if !opts.keys.include?(:noreply_wait)
 
-      self.noreply_wait() if opts[:noreply_wait]
-      @listener.terminate if @listener
+      self.noreply_wait() if opts[:noreply_wait] && self.is_open()
+      if @listener
+        @listener.terminate
+        @listener.join
+      end
+      @socket.close if @socket
       @listener = nil
-      @socket.close
       @socket = nil
+      @listener_mutex.synchronize {
+        @opts.clear
+        @data.clear
+        @waiters.values.each{ |w| w.signal }
+        @waiters.clear
+      }
+      self
     end
 
     def noreply_wait
-      raise RqlRuntimeError, "Error: Connection Closed." if !@socket || !@listener
+      raise RqlRuntimeError, "Connection is closed." if !self.is_open()
       q = [Query::QueryType::NOREPLY_WAIT]
       res = run_internal(q, {noreply: false}, new_token)
       if res['t'] != Response::ResponseType::WAIT_COMPLETE
@@ -305,24 +331,18 @@ module RethinkDB
       raise RqlRuntimeError, "No last connection.  Use RethinkDB::Connection.new."
     end
 
-    def stop_listener
-      if @listener
-        @listener.terminate
-        @listener.join
-        @listener = nil
-      end
-    end
-
     def note_data(token, data) # Synchronize around this!
+      raise RqlDriverError, "Unknown token in response." if !@waiters.has_key?(token)
       @data[token] = data
       @opts.delete(token)
-      @waiters.delete(token).signal if @waiters[token]
+      w = @waiters[token]
+      w.signal if w
     end
 
     def note_error(token, e) # Synchronize around this!
       data = {
-        't' => 16,
-        'r' => [e.inspect],
+        't' => Response::ResponseType::CLIENT_ERROR,
+        'r' => [e.message],
         'b' => []
       }
       note_data(token, data)
@@ -336,7 +356,7 @@ module RethinkDB
         def read_exn(len, timeout_sec=nil)
           maybe_timeout(timeout_sec) {
             buf = read len
-            if !buf or buf.length != len
+            if !buf || buf.length != len
               raise RqlRuntimeError, "Connection closed by server."
             end
             return buf
@@ -351,14 +371,15 @@ module RethinkDB
       end
       response = response[0...-1]
       if response != "SUCCESS"
-        raise RqlRuntimeError,"Server dropped connection with message: \"#{response}\""
+        raise RqlRuntimeError, "Server dropped connection with message: \"#{response}\""
       end
 
-      stop_listener if @listener
+      raise RqlDriverError, "Internal driver error, listener already started." \
+        if @listener
       @listener = Thread.new {
         while true
           begin
-            token = -1
+            token = nil
             token = @socket.read_exn(8).unpack('q<')[0]
             response_length = @socket.read_exn(4).unpack('L<')[0]
             response = @socket.read_exn(response_length)
@@ -368,22 +389,14 @@ module RethinkDB
               raise RqlRuntimeError, "Bad response, server is buggy.\n" +
                 "#{e.inspect}\n" + response
             end
-            if token == -1
-              @mutex.synchronize{@waiters.keys.each{|k| note_data(k, data)}}
-            else
-              @mutex.synchronize{note_data(token, data)}
-            end
+            @listener_mutex.synchronize{note_data(token, data)}
           rescue Exception => e
-            if token == -1
-              @mutex.synchronize {
-                @listener = nil
-                @waiters.keys.each{|k| note_error(k, e)}
-              }
+            @listener_mutex.synchronize {
+              @waiters.keys.each{ |k| note_error(k, e) }
+              @listener = nil
               Thread.current.terminate
               abort("unreachable")
-            else
-              @mutex.synchronize{note_error(token, e)}
-            end
+            }
           end
         end
       }

data/lib/ql2.pb.rb

@@ -44,6 +44,7 @@ module RethinkDB
 			SUCCESS_PARTIAL = 3
 			SUCCESS_FEED = 5
 			WAIT_COMPLETE = 4
+			SUCCESS_ATOM_FEED = 6
 			CLIENT_ERROR = 16
 			COMPILE_ERROR = 17
 			RUNTIME_ERROR = 18
@@ -116,8 +117,8 @@ module RethinkDB
 			REDUCE = 37
 			MAP = 38
 			FILTER = 39
-			CONCATMAP = 40
-			ORDERBY = 41
+			CONCAT_MAP = 40
+			ORDER_BY = 41
 			DISTINCT = 42
 			COUNT = 43
 			IS_EMPTY = 86
@@ -128,12 +129,13 @@ module RethinkDB
 			OUTER_JOIN = 49
 			EQ_JOIN = 50
 			ZIP = 72
+			RANGE = 173
 			INSERT_AT = 82
 			DELETE_AT = 83
 			CHANGE_AT = 84
 			SPLICE_AT = 85
 			COERCE_TO = 51
-			TYPEOF = 52
+			TYPE_OF = 52
 			UPDATE = 53
 			DELETE = 54
 			REPLACE = 55
@@ -144,6 +146,11 @@ module RethinkDB
 			TABLE_CREATE = 60
 			TABLE_DROP = 61
 			TABLE_LIST = 62
+			CONFIG = 174
+			STATUS = 175
+			WAIT = 177
+			RECONFIGURE = 176
+			REBALANCE = 179
 			SYNC = 138
 			INDEX_CREATE = 75
 			INDEX_DROP = 76
@@ -155,7 +162,7 @@ module RethinkDB
 			BRANCH = 65
 			ANY = 66
 			ALL = 67
-			FOREACH = 68
+			FOR_EACH = 68
 			FUNC = 69
 			ASC = 73
 			DESC = 74
@@ -166,6 +173,7 @@ module RethinkDB
 			SAMPLE = 81
 			DEFAULT = 92
 			JSON = 98
+			TO_JSON_STRING = 172
 			ISO8601 = 99
 			TO_ISO8601 = 100
 			EPOCH_TIME = 101

data/lib/rethinkdb.rb

@@ -1,14 +1,11 @@
-# Copyright 2010-2012 RethinkDB, all rights reserved.
-require 'rubygems'
-require 'ql2.pb.rb'
-require 'socket'
-require 'pp'
+# Copyright 2010-2014 RethinkDB, all rights reserved.
 
-load 'exc.rb'
-load 'net.rb'
-load 'shim.rb'
-load 'func.rb'
-load 'rpp.rb'
+require_relative './ql2.pb.rb'
+require_relative './exc.rb'
+require_relative './net.rb'
+require_relative './shim.rb'
+require_relative './func.rb'
+require_relative './rpp.rb'
 
 module RethinkDB
   module Shortcuts

data/lib/rpp.rb

@@ -1,4 +1,3 @@
-require 'pp'
 require 'prettyprint'
 
 module RethinkDB
@@ -75,11 +74,8 @@ module RethinkDB
     end
 
     def self.pp_int_func(q, func, bt)
-      # PP.pp [:func, func.to_json, bt]
       begin
-        # PP.pp func
         func_args = func[1][0][1].map{|x| x.to_pb}
-        # PP.pp JSON.parse(func_args.to_json)
         func_body = func[1][1]
         q.text(" ")
         q.group(0, "{", "}") {
@@ -108,14 +104,14 @@ module RethinkDB
       else
         return !["db", "db_create", "db_drop", "json", "funcall", "args", "branch", "http",
           "binary", "javascript", "random", "time", "iso8601", "epoch_time", "now",
-          "geojson", "point", "circle", "line", "polygon", "asc", "desc", "literal" ].include?(name)
+          "geojson", "point", "circle", "line", "polygon", "asc", "desc", "literal",
+          "range"].include?(name)
       end
     end
     def self.pp_int(q, term, bt, pre_dot=false)
       q.text("\x7", 0) if bt == []
 
       term = term.to_pb if term.class == RQL
-      # PP.pp [:pp_int, term.to_json, bt]
       if term.class != Array
         if term.class == Hash
           if not pp_pseudotype(q, term, bt)
@@ -193,7 +189,6 @@ module RethinkDB
       if args[-1] && args[-1].class == Array && args[-1][0] == Term::TermType::FUNC
         func_bt = bt_consume(bt, args.size() - 1 + arg_offset)
         func = args.pop
-        # PP.pp [:func_bt, bt, arg_offset, (args.size() - 1) + arg_offset, func_bt]
       end
 
       if args != [] || optargs != {}
@@ -208,7 +203,6 @@ module RethinkDB
                 q.text(",")
                 q.breakable
               end
-              # PP.pp [:int, arg.to_json, bt_consume(bt, index)]
               pp_int(q, arg, bt_consume(bt, index + arg_offset))
             }
             if optargs != {}
@@ -228,7 +222,6 @@ module RethinkDB
     end
 
     def self.pp(term, bt=nil)
-      # PP.pp bt
       begin
         q = PrettyPrint.new
         pp_int(q, term, bt, true)

data/lib/shim.rb

@@ -59,13 +59,14 @@ module RethinkDB
       rt = Response::ResponseType
       begin
         case r['t']
-        when rt::SUCCESS_ATOM     then r['r'][0]
-        when rt::SUCCESS_FEED     then r['r']
-        when rt::SUCCESS_PARTIAL  then r['r']
-        when rt::SUCCESS_SEQUENCE then r['r']
-        when rt::RUNTIME_ERROR    then raise RqlRuntimeError, r['r'][0]
-        when rt::COMPILE_ERROR    then raise RqlCompileError, r['r'][0]
-        when rt::CLIENT_ERROR     then raise RqlDriverError,  r['r'][0]
+        when rt::SUCCESS_ATOM      then r['r'][0]
+        when rt::SUCCESS_FEED      then r['r']
+        when rt::SUCCESS_ATOM_FEED then r['r']
+        when rt::SUCCESS_PARTIAL   then r['r']
+        when rt::SUCCESS_SEQUENCE  then r['r']
+        when rt::RUNTIME_ERROR     then raise RqlRuntimeError, r['r'][0]
+        when rt::COMPILE_ERROR     then raise RqlCompileError, r['r'][0]
+        when rt::CLIENT_ERROR      then raise RqlDriverError,  r['r'][0]
         else raise RqlRuntimeError, "Unexpected response: #{r.inspect}"
         end
       rescue RqlError => e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rethinkdb
 version: !ruby/object:Gem::Version
-  version: 1.15.0.0
+  version: 1.16.0.0
 platform: ruby
 authors:
 - RethinkDB Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -31,12 +31,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/ql2.pb.rb
-- lib/net.rb
-- lib/func.rb
 - lib/exc.rb
+- lib/func.rb
+- lib/net.rb
+- lib/rethinkdb.rb
 - lib/rpp.rb
 - lib/shim.rb
-- lib/rethinkdb.rb
 homepage: http://rethinkdb.com
 licenses:
 - Apache-2