rethinkdb 1.12.0.2 → 1.13.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fe537734bd0c2f1ad88fddf9b1d8204f526e2aa
-  data.tar.gz: 0eeff69befb30b5ca9d1ab97274a78668bd252e5
+  metadata.gz: 5777270a3f099a47a14f191c5da7bdd9c1b10dc8
+  data.tar.gz: de263295afd0c0e85e05c8b2f89ff371f9339014
 SHA512:
-  metadata.gz: 1e6749992400f655ab567c1d9e705ef1deee584561e76197e03ba65b694eeba21d1ed7bac2ec82c7ecdd89a6b38af9f341f7be92457f8c82c0bdf84c018cce2b
-  data.tar.gz: 6e3a0605724f1e36f1160c0c26b1f76bf5cb452d7c7dd5cb0f25fa4364818c3707e55d7ee6350f25035a8233f2761d90e8d076efece7c078b0b52dca4fc0d211
+  metadata.gz: 68982ecf1adac91ef225ed495ad2447f5b8e089a6a6313e68e1f8f986e8bd0130b82a5eedb82cc411bdc6534ebba6dc96846e40b2ba6ccfedfef0a3b01340ea3
+  data.tar.gz: 6fdfea2322bccdc0ac59b13b940d4a0fca748157d016d1077e4ab130ac0eb03eb04fc98162387e46b0da6dc57cb5f6b3672d63adf75e4b92d5cc959a86ae61a2

data/lib/func.rb

@@ -1,8 +1,9 @@
 module RethinkDB
   class RQL
+    @@gensym_mutex = Mutex.new
     @@gensym_cnt = 0
     def new_func(&b)
-      args = (0...b.arity).map{@@gensym_cnt += 1}
+      args = @@gensym_mutex.synchronize{(0...b.arity).map{@@gensym_cnt += 1}}
       body = b.call(*(args.map{|i| RQL.new.var i}))
       RQL.new.func(args, body)
     end
@@ -33,7 +34,9 @@ module RethinkDB
       :orderby => -1,
       :group => -1,
       :iso8601 => -1,
-      :index_create => -1
+      :index_create => -1,
+      :random => -1,
+      :http => 1
     }
     @@method_aliases = {
       :lt => :<,
@@ -53,7 +56,6 @@ module RethinkDB
       :javascript => :js,
       :typeof => :type_of
     }
-    @@allow_json = {:INSERT => true}
 
     termtypes = Term::TermType.constants.map{ |c| c.to_sym }
     termtypes.each {|termtype|
@@ -86,17 +88,13 @@ module RethinkDB
           optargs = a.delete_at(opt_offset) if a[opt_offset].class == Hash
         end
 
-        args = (@body ? [self] : []) + a + (b ? [new_func(&b)] : [])
-
-        t = Term.new
-        t.type = Term::TermType.const_get(termtype)
-        t.args = args.map{|x| RQL.new.expr(x, :allow_json => @@allow_json[termtype]).to_pb}
-        t.optargs = (optargs || {}).map {|k,v|
-          ap = Term::AssocPair.new
-          ap.key = k.to_s
-          ap.val = RQL.new.expr(v, :allow_json => @@allow_json[termtype]).to_pb
-          ap
-        }
+        args = ((@body != RQL) ? [self] : []) + a + (b ? [new_func(&b)] : [])
+
+        t = [Term::TermType.const_get(termtype),
+             args.map {|x| RQL.new.expr(x).to_pb},
+             *((optargs && optargs != {}) ?
+               [Hash[optargs.map {|k,v| [k.to_s, RQL.new.expr(v).to_pb]}]] :
+               [])]
         return RQL.new(t, bitop)
       }
 
@@ -108,7 +106,7 @@ module RethinkDB
     }
 
     def connect(*args, &b)
-      unbound_if @body
+      unbound_if @body != RQL
       c = Connection.new(*args)
       b ? begin b.call(c) ensure c.close end : c
     end
@@ -133,19 +131,21 @@ module RethinkDB
       you want a query that does equality comparison.
 
       If you need to see whether two queries are the same, compare
-      their protobufs like: `query1.to_pb == query2.to_pb`."
+      the raw qeuries like: `query1.to_pb == query2.to_pb`."
     end
 
     def do(*args, &b)
-      a = (@body ? [self] : []) + args.dup
+      a = ((@body != RQL) ? [self] : []) + args.dup
       if a == [] && !b
         raise RqlDriverError, "Expected 1 or more argument(s) but found 0."
       end
-      RQL.new.funcall(*((b ? [new_func(&b)] : [a.pop]) + a))
+      funcall_args = (b ? [new_func(&b)] : [a.pop]) + a
+      # PP.pp funcall_args
+      RQL.new.funcall(*funcall_args)
     end
 
     def row
-      unbound_if @body
+      unbound_if(@body != RQL)
       raise NoMethodError, ("Sorry, r.row is not available in the ruby driver.  " +
                             "Use blocks instead.")
     end

data/lib/net.rb

@@ -1,19 +1,8 @@
-# Copyright 2010-2012 RethinkDB, all rights reserved.
 require 'socket'
 require 'thread'
 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
@@ -23,8 +12,7 @@ module RethinkDB
     @@default_conn = nil
     def self.set_default_conn c; @@default_conn = c; end
     def run(c=@@default_conn, opts=nil, &b)
-      # $f.puts "("+RPP::pp(@body)+"),"
-      unbound_if !@body
+      unbound_if(@body == RQL)
       c, opts = @@default_conn, c if opts.nil? && !c.kind_of?(RethinkDB::Connection)
       opts = {} if opts.nil?
       opts = {opts => true} if opts.class != Hash
@@ -75,6 +63,7 @@ module RethinkDB
       @conn = connection
       @opts = opts
       @token = token
+      fetch_batch
     end
 
     def each (&block) # :nodoc:
@@ -84,11 +73,12 @@ module RethinkDB
       while true
         @results.each(&block)
         return self if !@more
-        q = RethinkDB::new_query(Query::QueryType::CONTINUE, @token)
-        res = @conn.run_internal q
+        res = @conn.wait(@token)
         @results = Shim.response_to_native(res, @msg, @opts)
-        if res.type == Response::ResponseType::SUCCESS_SEQUENCE
+        if res['t'] == Response::ResponseType::SUCCESS_SEQUENCE
           @more = false
+        else
+          fetch_batch
         end
       end
     end
@@ -96,14 +86,19 @@ module RethinkDB
     def close
       if @more
         @more = false
-        q = RethinkDB::new_query(Query::QueryType::STOP, @token)
-        res = @conn.run_internal q
-        if res.type != Response::ResponseType::SUCCESS_SEQUENCE || res.response != []
+        q = [Query::QueryType::STOP]
+        res = @conn.run_internal(q, @opts, @token)
+        if res['t'] != Response::ResponseType::SUCCESS_SEQUENCE || res.response != []
           raise RqlRuntimeError, "Server sent malformed STOP response #{PP.pp(res, "")}"
         end
         return true
       end
     end
+
+    def fetch_batch
+      @conn.set_opts(@token, @opts)
+      @conn.dispatch([Query::QueryType::CONTINUE], @token)
+    end
   end
 
   class Connection
@@ -134,48 +129,53 @@ module RethinkDB
     attr_reader :default_db, :conn_id
 
     @@token_cnt = 0
-    def run_internal(q, noreply=false)
-      dispatch q
-      noreply ? nil : wait(q.token)
+    def set_opts(token, opts)
+      @mutex.synchronize{@opts[token] = opts}
+    end
+    def run_internal(q, opts, token)
+      set_opts(token, opts)
+      noreply = opts[:noreply]
+
+      dispatch(q, token)
+      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
-      q = RethinkDB::new_query(Query::QueryType::START, @@token_cnt += 1)
-      q.query = msg
 
+      global_optargs = {}
       all_opts = @default_opts.merge(opts)
       if all_opts.keys.include?(:noreply)
         all_opts[:noreply] = !!all_opts[:noreply]
       end
-      all_opts.each {|k,v|
-        ap = Query::AssocPair.new
-        ap.key = k.to_s
-        if v.class == RQL
-          ap.val = v.to_pb
-        else
-          ap.val = RQL.new.expr(v).to_pb
-        end
-        q.global_optargs << ap
-      }
 
-      res = run_internal(q, all_opts[:noreply])
+      token = (@@token_cnt += 1)
+      q = [Query::QueryType::START,
+           msg,
+           Hash[all_opts.map {|k,v|
+                  [k.to_s, (v.class == RQL ? v.to_pb : RQL.new.expr(v).to_pb)]
+                }]]
+
+      res = run_internal(q, all_opts, token)
       return res if !res
-      if res.type == Response::ResponseType::SUCCESS_PARTIAL
+      if res['t'] == Response::ResponseType::SUCCESS_PARTIAL ||
+          res['t'] == Response::ResponseType::SUCCESS_FEED
         value = Cursor.new(Shim.response_to_native(res, msg, opts),
-                   msg, self, opts, q.token, true)
-      elsif res.type == Response::ResponseType::SUCCESS_SEQUENCE
+                           msg, self, opts, token, true)
+      elsif res['t'] == Response::ResponseType::SUCCESS_SEQUENCE
         value = Cursor.new(Shim.response_to_native(res, msg, opts),
-                   msg, self, opts, q.token, false)
+                   msg, self, opts, token, false)
       else
         value = Shim.response_to_native(res, msg, opts)
       end
 
-      if res.respond_to? :has_profile? and res.has_profile?
-          real_val = {"profile" => Shim.datum_to_native(res.profile(), opts),
-                      "value" => value}
+      if res['p']
+        real_val = {
+          "profile" => res['p'],
+          "value" => value
+        }
       else
-          real_val = value
+        real_val = value
       end
 
       if b
@@ -193,12 +193,11 @@ module RethinkDB
       @socket.write(packet)
     end
 
-    def dispatch msg
-      # PP.pp msg if $DEBUG
-      payload = msg.serialize_to_string
-      # File.open('sexp_payloads.txt', 'a') {|f| f.write(payload.inspect+"\n")}
-      send([payload.length].pack('L<') + payload)
-      return msg.token
+    def dispatch(msg, token)
+      payload = Shim.dump_json(msg).force_encoding('BINARY')
+      prefix = [token, payload.bytesize].pack('Q<L<')
+      send(prefix + payload)
+      return token
     end
 
     def wait token
@@ -231,7 +230,8 @@ module RethinkDB
     end
 
     @@last = nil
-    @@magic_number = VersionDummy::Version::V0_2
+    @@magic_number = VersionDummy::Version::V0_3
+    @@wire_protocol = VersionDummy::Protocol::JSON
 
     def debug_socket; @socket; end
 
@@ -249,9 +249,10 @@ module RethinkDB
       self.noreply_wait() if opts[:noreply_wait]
 
       stop_listener
-      @socket.close if @socket
+      @socket.close rescue nil if @socket
       @socket = TCPSocket.open(@host, @port)
       @waiters = {}
+      @opts = {}
       @data = {}
       @mutex = Mutex.new
       @conn_id += 1
@@ -277,9 +278,9 @@ module RethinkDB
 
     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
+      q = [Query::QueryType::NOREPLY_WAIT]
+      res = run_internal(q, {noreply: false}, @@token_cnt += 1)
+      if res['t'] != Response::ResponseType::WAIT_COMPLETE
         raise RqlRuntimeError, "Unexpected response to noreply_wait: " + PP.pp(res, "")
       end
       nil
@@ -298,6 +299,21 @@ module RethinkDB
       end
     end
 
+    def note_data(token, data) # Synchronize around this!
+      @data[token] = data
+      @opts.delete(token)
+      @waiters.delete(token).signal if @waiters[token]
+    end
+
+    def note_error(token, e) # Synchronize around this!
+      data = {
+        't' => 16,
+        'r' => [e.inspect],
+        'b' => []
+      }
+      note_data(token, data)
+    end
+
     def start_listener
       class << @socket
         def maybe_timeout(sec=nil, &b)
@@ -316,6 +332,7 @@ module RethinkDB
       @socket.write([@@magic_number].pack('L<'))
 
       @socket.write([@auth_key.size].pack('L<') + @auth_key)
+      @socket.write([@@wire_protocol].pack('L<'))
       response = ""
       while response[-1..-1] != "\0"
         response += @socket.read_exn(1, 20)
@@ -327,44 +344,36 @@ module RethinkDB
 
       stop_listener if @listener
       @listener = Thread.new {
-        loop {
+        while true
           begin
+            token = -1
+            token = @socket.read_exn(8).unpack('q<')[0]
             response_length = @socket.read_exn(4).unpack('L<')[0]
             response = @socket.read_exn(response_length)
-          rescue RqlRuntimeError => e
-            @mutex.synchronize {
-              @listener = nil
-              @waiters.each {|kv| kv[1].signal}
-            }
-            Thread.current.terminate
-            abort("unreachable")
-          end
-          #TODO: Recovery
-          begin
-            protob = Response.parse(response)
-          rescue
-            raise RqlRuntimeError, "Bad Protobuf #{response}, server is buggy."
-          end
-          if protob.token == -1
-            @mutex.synchronize {
-              @waiters.keys.each {|k|
-                @data[k] = protob
-                if @waiters[k]
-                  cond = @waiters.delete k
-                  cond.signal
-                end
+            begin
+              data = Shim.load_json(response, @opts[token])
+            rescue Exception => e
+              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
+          rescue Exception => e
+            if token == -1
+              @mutex.synchronize {
+                @listener = nil
+                @waiters.keys.each{|k| note_error(k, e)}
               }
-            }
-          else
-            @mutex.synchronize {
-              @data[protob.token] = protob
-              if @waiters[protob.token]
-                cond = @waiters.delete protob.token
-                cond.signal
-              end
-            }
+              Thread.current.terminate
+              abort("unreachable")
+            else
+              @mutex.synchronize{note_error(token, e)}
+            end
           end
-        }
+        end
       }
     end
   end

data/lib/ql2.pb.rb

@@ -1,324 +1,220 @@
-#!/usr/bin/env ruby
-# Generated by the protocol buffer compiler. DO NOT EDIT!
-
-require 'protocol_buffers'
-
-# forward declarations
-class VersionDummy < ::ProtocolBuffers::Message; end
-class Query < ::ProtocolBuffers::Message; end
-class Frame < ::ProtocolBuffers::Message; end
-class Backtrace < ::ProtocolBuffers::Message; end
-class Response < ::ProtocolBuffers::Message; end
-class Datum < ::ProtocolBuffers::Message; end
-class Term < ::ProtocolBuffers::Message; end
-
-class VersionDummy < ::ProtocolBuffers::Message
-  # forward declarations
-
-  # enums
-  module Version
-    include ::ProtocolBuffers::Enum
-
-    set_fully_qualified_name "VersionDummy.Version"
-
-    V0_1 = 1063369270
-    V0_2 = 1915781601
-  end
-
-  set_fully_qualified_name "VersionDummy"
-
-end
-
-class Query < ::ProtocolBuffers::Message
-  # forward declarations
-  class AssocPair < ::ProtocolBuffers::Message; end
-
-  # enums
-  module QueryType
-    include ::ProtocolBuffers::Enum
-
-    set_fully_qualified_name "Query.QueryType"
-
-    START = 1
-    CONTINUE = 2
-    STOP = 3
-    NOREPLY_WAIT = 4
-  end
-
-  set_fully_qualified_name "Query"
-
-  # nested messages
-  class AssocPair < ::ProtocolBuffers::Message
-    set_fully_qualified_name "Query.AssocPair"
-
-    optional :string, :key, 1
-    optional ::Term, :val, 2
-  end
-
-  optional ::Query::QueryType, :type, 1
-  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
-
-class Frame < ::ProtocolBuffers::Message
-  # forward declarations
-
-  # enums
-  module FrameType
-    include ::ProtocolBuffers::Enum
-
-    set_fully_qualified_name "Frame.FrameType"
-
-    POS = 1
-    OPT = 2
-  end
-
-  set_fully_qualified_name "Frame"
-
-  optional ::Frame::FrameType, :type, 1
-  optional :int64, :pos, 2
-  optional :string, :opt, 3
-end
-
-class Backtrace < ::ProtocolBuffers::Message
-  set_fully_qualified_name "Backtrace"
-
-  repeated ::Frame, :frames, 1
+# DO NOT EDIT
+# Autogenerated by convert_protofile
+
+module RethinkDB
+	module VersionDummy
+		module Version
+			V0_1 = 1063369270
+			V0_2 = 1915781601
+			V0_3 = 1601562686
+		end
+		
+		module Protocol
+			PROTOBUF = 656407617
+			JSON = 2120839367
+		end
+	end
+	
+	module Query
+		module QueryType
+			START = 1
+			CONTINUE = 2
+			STOP = 3
+			NOREPLY_WAIT = 4
+		end
+		
+		module AssocPair
+		end
+	end
+	
+	module Frame
+		module FrameType
+			POS = 1
+			OPT = 2
+		end
+	end
+	
+	module Backtrace
+	end
+	
+	module Response
+		module ResponseType
+			SUCCESS_ATOM = 1
+			SUCCESS_SEQUENCE = 2
+			SUCCESS_PARTIAL = 3
+			SUCCESS_FEED = 5
+			WAIT_COMPLETE = 4
+			CLIENT_ERROR = 16
+			COMPILE_ERROR = 17
+			RUNTIME_ERROR = 18
+		end
+	end
+	
+	module Datum
+		module DatumType
+			R_NULL = 1
+			R_BOOL = 2
+			R_NUM = 3
+			R_STR = 4
+			R_ARRAY = 5
+			R_OBJECT = 6
+			R_JSON = 7
+		end
+		
+		module AssocPair
+		end
+	end
+	
+	module Term
+		module TermType
+			DATUM = 1
+			MAKE_ARRAY = 2
+			MAKE_OBJ = 3
+			VAR = 10
+			JAVASCRIPT = 11
+			HTTP = 153
+			ERROR = 12
+			IMPLICIT_VAR = 13
+			DB = 14
+			TABLE = 15
+			GET = 16
+			GET_ALL = 78
+			EQ = 17
+			NE = 18
+			LT = 19
+			LE = 20
+			GT = 21
+			GE = 22
+			NOT = 23
+			ADD = 24
+			SUB = 25
+			MUL = 26
+			DIV = 27
+			MOD = 28
+			APPEND = 29
+			PREPEND = 80
+			DIFFERENCE = 95
+			SET_INSERT = 88
+			SET_INTERSECTION = 89
+			SET_UNION = 90
+			SET_DIFFERENCE = 91
+			SLICE = 30
+			SKIP = 70
+			LIMIT = 71
+			INDEXES_OF = 87
+			CONTAINS = 93
+			GET_FIELD = 31
+			KEYS = 94
+			OBJECT = 143
+			HAS_FIELDS = 32
+			WITH_FIELDS = 96
+			PLUCK = 33
+			WITHOUT = 34
+			MERGE = 35
+			BETWEEN = 36
+			REDUCE = 37
+			MAP = 38
+			FILTER = 39
+			CONCATMAP = 40
+			ORDERBY = 41
+			DISTINCT = 42
+			COUNT = 43
+			IS_EMPTY = 86
+			UNION = 44
+			NTH = 45
+			INNER_JOIN = 48
+			OUTER_JOIN = 49
+			EQ_JOIN = 50
+			ZIP = 72
+			INSERT_AT = 82
+			DELETE_AT = 83
+			CHANGE_AT = 84
+			SPLICE_AT = 85
+			COERCE_TO = 51
+			TYPEOF = 52
+			UPDATE = 53
+			DELETE = 54
+			REPLACE = 55
+			INSERT = 56
+			DB_CREATE = 57
+			DB_DROP = 58
+			DB_LIST = 59
+			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
+			ALL = 67
+			FOREACH = 68
+			FUNC = 69
+			ASC = 73
+			DESC = 74
+			INFO = 79
+			MATCH = 97
+			UPCASE = 141
+			DOWNCASE = 142
+			SAMPLE = 81
+			DEFAULT = 92
+			JSON = 98
+			ISO8601 = 99
+			TO_ISO8601 = 100
+			EPOCH_TIME = 101
+			TO_EPOCH_TIME = 102
+			NOW = 103
+			IN_TIMEZONE = 104
+			DURING = 105
+			DATE = 106
+			TIME_OF_DAY = 126
+			TIMEZONE = 127
+			YEAR = 128
+			MONTH = 129
+			DAY = 130
+			DAY_OF_WEEK = 131
+			DAY_OF_YEAR = 132
+			HOURS = 133
+			MINUTES = 134
+			SECONDS = 135
+			TIME = 136
+			MONDAY = 107
+			TUESDAY = 108
+			WEDNESDAY = 109
+			THURSDAY = 110
+			FRIDAY = 111
+			SATURDAY = 112
+			SUNDAY = 113
+			JANUARY = 114
+			FEBRUARY = 115
+			MARCH = 116
+			APRIL = 117
+			MAY = 118
+			JUNE = 119
+			JULY = 120
+			AUGUST = 121
+			SEPTEMBER = 122
+			OCTOBER = 123
+			NOVEMBER = 124
+			DECEMBER = 125
+			LITERAL = 137
+			GROUP = 144
+			SUM = 145
+			AVG = 146
+			MIN = 147
+			MAX = 148
+			SPLIT = 149
+			UNGROUP = 150
+			RANDOM = 151
+			CHANGES = 152
+			ARGS = 154
+		end
+		
+		module AssocPair
+		end
+	end
 end
-
-class Response < ::ProtocolBuffers::Message
-  # forward declarations
-
-  # enums
-  module ResponseType
-    include ::ProtocolBuffers::Enum
-
-    set_fully_qualified_name "Response.ResponseType"
-
-    SUCCESS_ATOM = 1
-    SUCCESS_SEQUENCE = 2
-    SUCCESS_PARTIAL = 3
-    WAIT_COMPLETE = 4
-    CLIENT_ERROR = 16
-    COMPILE_ERROR = 17
-    RUNTIME_ERROR = 18
-  end
-
-  set_fully_qualified_name "Response"
-
-  optional ::Response::ResponseType, :type, 1
-  optional :int64, :token, 2
-  repeated ::Datum, :response, 3
-  optional ::Backtrace, :backtrace, 4
-  optional ::Datum, :profile, 5
-end
-
-class Datum < ::ProtocolBuffers::Message
-  # forward declarations
-  class AssocPair < ::ProtocolBuffers::Message; end
-
-  # enums
-  module DatumType
-    include ::ProtocolBuffers::Enum
-
-    set_fully_qualified_name "Datum.DatumType"
-
-    R_NULL = 1
-    R_BOOL = 2
-    R_NUM = 3
-    R_STR = 4
-    R_ARRAY = 5
-    R_OBJECT = 6
-    R_JSON = 7
-  end
-
-  set_fully_qualified_name "Datum"
-
-  # nested messages
-  class AssocPair < ::ProtocolBuffers::Message
-    set_fully_qualified_name "Datum.AssocPair"
-
-    optional :string, :key, 1
-    optional ::Datum, :val, 2
-  end
-
-  optional ::Datum::DatumType, :type, 1
-  optional :bool, :r_bool, 2
-  optional :double, :r_num, 3
-  optional :string, :r_str, 4
-  repeated ::Datum, :r_array, 5
-  repeated ::Datum::AssocPair, :r_object, 6
-end
-
-class Term < ::ProtocolBuffers::Message
-  # forward declarations
-  class AssocPair < ::ProtocolBuffers::Message; end
-
-  # enums
-  module TermType
-    include ::ProtocolBuffers::Enum
-
-    set_fully_qualified_name "Term.TermType"
-
-    DATUM = 1
-    MAKE_ARRAY = 2
-    MAKE_OBJ = 3
-    VAR = 10
-    JAVASCRIPT = 11
-    ERROR = 12
-    IMPLICIT_VAR = 13
-    DB = 14
-    TABLE = 15
-    GET = 16
-    GET_ALL = 78
-    EQ = 17
-    NE = 18
-    LT = 19
-    LE = 20
-    GT = 21
-    GE = 22
-    NOT = 23
-    ADD = 24
-    SUB = 25
-    MUL = 26
-    DIV = 27
-    MOD = 28
-    APPEND = 29
-    PREPEND = 80
-    DIFFERENCE = 95
-    SET_INSERT = 88
-    SET_INTERSECTION = 89
-    SET_UNION = 90
-    SET_DIFFERENCE = 91
-    SLICE = 30
-    SKIP = 70
-    LIMIT = 71
-    INDEXES_OF = 87
-    CONTAINS = 93
-    GET_FIELD = 31
-    KEYS = 94
-    OBJECT = 143
-    HAS_FIELDS = 32
-    WITH_FIELDS = 96
-    PLUCK = 33
-    WITHOUT = 34
-    MERGE = 35
-    BETWEEN = 36
-    REDUCE = 37
-    MAP = 38
-    FILTER = 39
-    CONCATMAP = 40
-    ORDERBY = 41
-    DISTINCT = 42
-    COUNT = 43
-    IS_EMPTY = 86
-    UNION = 44
-    NTH = 45
-    INNER_JOIN = 48
-    OUTER_JOIN = 49
-    EQ_JOIN = 50
-    ZIP = 72
-    INSERT_AT = 82
-    DELETE_AT = 83
-    CHANGE_AT = 84
-    SPLICE_AT = 85
-    COERCE_TO = 51
-    TYPEOF = 52
-    UPDATE = 53
-    DELETE = 54
-    REPLACE = 55
-    INSERT = 56
-    DB_CREATE = 57
-    DB_DROP = 58
-    DB_LIST = 59
-    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
-    ALL = 67
-    FOREACH = 68
-    FUNC = 69
-    ASC = 73
-    DESC = 74
-    INFO = 79
-    MATCH = 97
-    UPCASE = 141
-    DOWNCASE = 142
-    SAMPLE = 81
-    DEFAULT = 92
-    JSON = 98
-    ISO8601 = 99
-    TO_ISO8601 = 100
-    EPOCH_TIME = 101
-    TO_EPOCH_TIME = 102
-    NOW = 103
-    IN_TIMEZONE = 104
-    DURING = 105
-    DATE = 106
-    TIME_OF_DAY = 126
-    TIMEZONE = 127
-    YEAR = 128
-    MONTH = 129
-    DAY = 130
-    DAY_OF_WEEK = 131
-    DAY_OF_YEAR = 132
-    HOURS = 133
-    MINUTES = 134
-    SECONDS = 135
-    TIME = 136
-    MONDAY = 107
-    TUESDAY = 108
-    WEDNESDAY = 109
-    THURSDAY = 110
-    FRIDAY = 111
-    SATURDAY = 112
-    SUNDAY = 113
-    JANUARY = 114
-    FEBRUARY = 115
-    MARCH = 116
-    APRIL = 117
-    MAY = 118
-    JUNE = 119
-    JULY = 120
-    AUGUST = 121
-    SEPTEMBER = 122
-    OCTOBER = 123
-    NOVEMBER = 124
-    DECEMBER = 125
-    LITERAL = 137
-    GROUP = 144
-    SUM = 145
-    AVG = 146
-    MIN = 147
-    MAX = 148
-    SPLIT = 149
-    UNGROUP = 150
-  end
-
-  set_fully_qualified_name "Term"
-
-  # nested messages
-  class AssocPair < ::ProtocolBuffers::Message
-    set_fully_qualified_name "Term.AssocPair"
-
-    optional :string, :key, 1
-    optional ::Term, :val, 2
-  end
-
-  optional ::Term::TermType, :type, 1
-  optional ::Datum, :datum, 2
-  repeated ::Term, :args, 3
-  repeated ::Term::AssocPair, :optargs, 4
-end
-