rethinkdb 1.10.0.1 → 1.11.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59e79e6d9c3439b65c7eb4d100996304062ea23a
-  data.tar.gz: f56d759a19a9db15fe6affbd712c54a5cdee2e5a
+  metadata.gz: 003e171146b67e41c8f89bf9c85f21f6860dace3
+  data.tar.gz: 34fc0e2e3df5e8655d12e6b6d402784e7a390a49
 SHA512:
-  metadata.gz: 79020581d60bd00e3fe43f49e14ac3c4d6282ace1655ce019aa6bd1f8502289668cc287d178a9b2f852b5579917a759a7e583ffac3b3ecb99d08f061604c5054
-  data.tar.gz: e17aa512ff7ef6710b17dae2386ae650e1956d5fba4e27b7780a133e133362fa6e1dd0d60720871a4535f5838077ff2ffca6014b1bd8efbd9e07f225f365d84d
+  metadata.gz: 6ae00357bc05acf7cb924aa63c919d3f40da606e0141be9c073548e669bc2c738a94c38400aac13ffb536fe6a45252c691ae7dfd77d3fe04aa8856e4b289b8f1
+  data.tar.gz: d80dfbcb3236697469b8555aa734840cac09cda41e60d6daa1e637780069b99ff08b9dfc81f218eef10b01c1b0a9bb8d46ff08ed40d894f4b963bf043b641c24

data/lib/net.rb

@@ -6,6 +6,14 @@ require 'timeout'
 # $f = File.open("fuzz_seed.rb", "w")
 
 module RethinkDB
+  def self.new_query(type, token)
+    q = Query.new
+    q.type = type
+    q.accepts_r_json = true
+    q.token = token
+    return q
+  end
+
   module Faux_Abort
     class Abort
     end
@@ -70,9 +78,7 @@ module RethinkDB
       while true
         @results.each(&block)
         return self if !@more
-        q = Query.new
-        q.type = Query::QueryType::CONTINUE
-        q.token = @token
+        q = RethinkDB::new_query(Query::QueryType::CONTINUE, @token)
         res = @conn.run_internal q
         @results = Shim.response_to_native(res, @msg, @opts)
         if res.type == Response::ResponseType::SUCCESS_SEQUENCE
@@ -105,7 +111,7 @@ module RethinkDB
       @@last = self
       @default_opts = default_db ? {:db => RQL.new.db(default_db)} : {}
       @conn_id = 0
-      reconnect
+      reconnect(:noreply_wait => false)
     end
     attr_reader :default_db, :conn_id
 
@@ -115,12 +121,10 @@ module RethinkDB
       noreply ? nil : wait(q.token)
     end
     def run(msg, opts)
-      reconnect if @auto_reconnect && (!@socket || !@listener)
-      raise RuntimeError, "Error: Connection Closed." if !@socket || !@listener
-      q = Query.new
-      q.type = Query::QueryType::START
+      reconnect(:noreply_wait => false) if @auto_reconnect && (!@socket || !@listener)
+      raise RqlRuntimeError, "Error: Connection Closed." if !@socket || !@listener
+      q = RethinkDB::new_query(Query::QueryType::START, @@token_cnt += 1)
       q.query = msg
-      q.token = @@token_cnt += 1
 
       all_opts = @default_opts.merge(opts)
       if all_opts.keys.include?(:noreply)
@@ -140,13 +144,20 @@ module RethinkDB
       res = run_internal(q, all_opts[:noreply])
       return res if !res
       if res.type == Response::ResponseType::SUCCESS_PARTIAL
-        Cursor.new(Shim.response_to_native(res, msg, opts),
+        value = Cursor.new(Shim.response_to_native(res, msg, opts),
                    msg, self, opts, q.token, true)
       elsif res.type == Response::ResponseType::SUCCESS_SEQUENCE
-        Cursor.new(Shim.response_to_native(res, msg, opts),
+        value = Cursor.new(Shim.response_to_native(res, msg, opts),
                    msg, self, opts, q.token, false)
       else
-        Shim.response_to_native(res, msg, opts)
+        value = Shim.response_to_native(res, msg, opts)
+      end
+
+      if res.respond_to? :has_profile? and res.has_profile?
+          {"profile" => Shim.datum_to_native(res.profile(), opts),
+           "value" => value}
+      else
+          value
       end
     end
 
@@ -174,7 +185,7 @@ module RethinkDB
         return res
       rescue @abort_module::Abort => e
         print "\nAborting query and reconnecting...\n"
-        reconnect
+        reconnect(:noreply_wait => false)
         raise e
       end
     end
@@ -197,8 +208,17 @@ module RethinkDB
     def debug_socket; @socket; end
 
     # Reconnect to the server.  This will interrupt all queries on the
-    # server and invalidate all outstanding enumerables on the client.
-    def reconnect
+    # server (if :noreply_wait => false) and invalidate all outstanding
+    # 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]
       @socket.close if @socket
       @socket = TCPSocket.open(@host, @port)
       @waiters = {}
@@ -209,13 +229,31 @@ module RethinkDB
       self
     end
 
-    def close
+    def close(opts={})
+      raise ArgumentError, "Argument to close must be a hash." if opts.class != Hash
+      if not (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)
+
+      self.noreply_wait() if opts[:noreply_wait]
       @listener.terminate if @listener
       @listener = nil
       @socket.close
       @socket = nil
     end
 
+    def noreply_wait
+      raise RqlRuntimeError, "Error: Connection Closed." if !@socket || !@listener
+      q = RethinkDB::new_query(Query::QueryType::NOREPLY_WAIT, @@token_cnt += 1)
+      res = run_internal(q)
+      if res.type != Response::ResponseType::WAIT_COMPLETE
+        raise RqlRuntimeError, "Unexpected response to noreply_wait: " + PP.pp(res, "")
+      end
+      nil
+    end
+
     def self.last
       return @@last if @@last
       raise RqlRuntimeError, "No last connection.  Use RethinkDB::Connection.new."

data/lib/ql2.pb.rb

@@ -42,6 +42,7 @@ class Query < ::ProtocolBuffers::Message
     START = 1
     CONTINUE = 2
     STOP = 3
+    NOREPLY_WAIT = 4
   end
 
   set_fully_qualified_name "Query"
@@ -58,6 +59,7 @@ class Query < ::ProtocolBuffers::Message
   optional ::Term, :query, 2
   optional :int64, :token, 3
   optional :bool, :OBSOLETE_noreply, 4, :default => false
+  optional :bool, :accepts_r_json, 5, :default => false
   repeated ::Query::AssocPair, :global_optargs, 6
 end
 
@@ -99,6 +101,7 @@ class Response < ::ProtocolBuffers::Message
     SUCCESS_ATOM = 1
     SUCCESS_SEQUENCE = 2
     SUCCESS_PARTIAL = 3
+    WAIT_COMPLETE = 4
     CLIENT_ERROR = 16
     COMPILE_ERROR = 17
     RUNTIME_ERROR = 18
@@ -110,6 +113,7 @@ class Response < ::ProtocolBuffers::Message
   optional :int64, :token, 2
   repeated ::Datum, :response, 3
   optional ::Backtrace, :backtrace, 4
+  optional ::Datum, :profile, 5
 end
 
 class Datum < ::ProtocolBuffers::Message
@@ -128,6 +132,7 @@ class Datum < ::ProtocolBuffers::Message
     R_STR = 4
     R_ARRAY = 5
     R_OBJECT = 6
+    R_JSON = 7
   end
 
   set_fully_qualified_name "Datum"
@@ -233,9 +238,12 @@ class Term < ::ProtocolBuffers::Message
     TABLE_CREATE = 60
     TABLE_DROP = 61
     TABLE_LIST = 62
+    SYNC = 138
     INDEX_CREATE = 75
     INDEX_DROP = 76
     INDEX_LIST = 77
+    INDEX_STATUS = 139
+    INDEX_WAIT = 140
     FUNCALL = 64
     BRANCH = 65
     ANY = 66

data/lib/shim.rb

@@ -21,7 +21,9 @@ module RethinkDB
         else
           obj
         end
-      else raise RqlRuntimeError, "Unimplemented."
+      when dt::R_JSON then
+        JSON.parse("[" + d.r_str + "]")[0]
+      else raise RqlRuntimeError, "#{dt} Unimplemented."
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rethinkdb
 version: !ruby/object:Gem::Version
-  version: 1.10.0.1
+  version: 1.11.0.0
 platform: ruby
 authors:
 - RethinkDB Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -46,11 +46,11 @@ extra_rdoc_files: []
 files:
 - lib/exc.rb
 - lib/ql2.pb.rb
-- lib/net.rb
 - lib/rethinkdb.rb
 - lib/rpp.rb
-- lib/shim.rb
 - lib/func.rb
+- lib/net.rb
+- lib/shim.rb
 homepage: http://rethinkdb.com
 licenses:
 - Apache-2