hyper_record 0.9.3 → 0.9.4

data/lib/hypertable/gen-rb/client_types.rb

@@ -7,7 +7,7 @@
 
 module Hypertable
   module ThriftGen
-        module CellFlag
+        module KeyFlag
           DELETE_ROW = 0
           DELETE_CF = 1
           DELETE_CELL = 2
@@ -39,13 +39,12 @@ module Hypertable
         #   <dd>Whether the end row is included in the result (default: true)</dd>
         # </dl>
         class RowInterval
-          include ::Thrift::Struct
+          include ::Thrift::Struct, ::Thrift::Struct_Union
           START_ROW = 1
           START_INCLUSIVE = 2
           END_ROW = 3
           END_INCLUSIVE = 4
 
-          ::Thrift::Struct.field_accessor self, :start_row, :start_inclusive, :end_row, :end_inclusive
           FIELDS = {
             START_ROW => {:type => ::Thrift::Types::STRING, :name => 'start_row', :optional => true},
             START_INCLUSIVE => {:type => ::Thrift::Types::BOOL, :name => 'start_inclusive', :default => true, :optional => true},
@@ -58,6 +57,7 @@ module Hypertable
           def validate
           end
 
+          ::Thrift::Struct.generate_accessors self
         end
 
         # Specifies a range of cells
@@ -84,7 +84,7 @@ module Hypertable
         #   <dd>Whether the end row is included in the result (default: true)</dd>
         # </dl>
         class CellInterval
-          include ::Thrift::Struct
+          include ::Thrift::Struct, ::Thrift::Struct_Union
           START_ROW = 1
           START_COLUMN = 2
           START_INCLUSIVE = 3
@@ -92,7 +92,6 @@ module Hypertable
           END_COLUMN = 5
           END_INCLUSIVE = 6
 
-          ::Thrift::Struct.field_accessor self, :start_row, :start_column, :start_inclusive, :end_row, :end_column, :end_inclusive
           FIELDS = {
             START_ROW => {:type => ::Thrift::Types::STRING, :name => 'start_row', :optional => true},
             START_COLUMN => {:type => ::Thrift::Types::STRING, :name => 'start_column', :optional => true},
@@ -107,6 +106,7 @@ module Hypertable
           def validate
           end
 
+          ::Thrift::Struct.generate_accessors self
         end
 
         # Specifies options for a scan
@@ -138,9 +138,12 @@ module Hypertable
         # 
         #   <dt>columns</dt>
         #   <dd>Specifies the names of the columns to return</dd>
+        # 
+        #   <dt>cell_limit</dt>
+        #   <dd>Specifies max number of cells to return per column family per row</dd>
         # </dl>
         class ScanSpec
-          include ::Thrift::Struct
+          include ::Thrift::Struct, ::Thrift::Struct_Union
           ROW_INTERVALS = 1
           CELL_INTERVALS = 2
           RETURN_DELETES = 3
@@ -150,8 +153,8 @@ module Hypertable
           END_TIME = 7
           COLUMNS = 8
           KEYS_ONLY = 9
+          CELL_LIMIT = 10
 
-          ::Thrift::Struct.field_accessor self, :row_intervals, :cell_intervals, :return_deletes, :revs, :row_limit, :start_time, :end_time, :columns, :keys_only
           FIELDS = {
             ROW_INTERVALS => {:type => ::Thrift::Types::LIST, :name => 'row_intervals', :element => {:type => ::Thrift::Types::STRUCT, :class => Hypertable::ThriftGen::RowInterval}, :optional => true},
             CELL_INTERVALS => {:type => ::Thrift::Types::LIST, :name => 'cell_intervals', :element => {:type => ::Thrift::Types::STRUCT, :class => Hypertable::ThriftGen::CellInterval}, :optional => true},
@@ -161,7 +164,8 @@ module Hypertable
             START_TIME => {:type => ::Thrift::Types::I64, :name => 'start_time', :optional => true},
             END_TIME => {:type => ::Thrift::Types::I64, :name => 'end_time', :optional => true},
             COLUMNS => {:type => ::Thrift::Types::LIST, :name => 'columns', :element => {:type => ::Thrift::Types::STRING}, :optional => true},
-            KEYS_ONLY => {:type => ::Thrift::Types::BOOL, :name => 'keys_only', :default => false, :optional => true}
+            KEYS_ONLY => {:type => ::Thrift::Types::BOOL, :name => 'keys_only', :default => false, :optional => true},
+            CELL_LIMIT => {:type => ::Thrift::Types::I32, :name => 'cell_limit', :default => 0, :optional => true}
           }
 
           def struct_fields; FIELDS; end
@@ -169,6 +173,7 @@ module Hypertable
           def validate
           end
 
+          ::Thrift::Struct.generate_accessors self
         end
 
         # Defines a cell key
@@ -195,7 +200,7 @@ module Hypertable
         #   <dd>A 16-bit integer indicating the state of the cell</dd>
         # </dl>
         class Key
-          include ::Thrift::Struct
+          include ::Thrift::Struct, ::Thrift::Struct_Union
           ROW = 1
           COLUMN_FAMILY = 2
           COLUMN_QUALIFIER = 3
@@ -203,21 +208,24 @@ module Hypertable
           REVISION = 5
           FLAG = 6
 
-          ::Thrift::Struct.field_accessor self, :row, :column_family, :column_qualifier, :timestamp, :revision, :flag
           FIELDS = {
             ROW => {:type => ::Thrift::Types::STRING, :name => 'row'},
             COLUMN_FAMILY => {:type => ::Thrift::Types::STRING, :name => 'column_family'},
             COLUMN_QUALIFIER => {:type => ::Thrift::Types::STRING, :name => 'column_qualifier'},
             TIMESTAMP => {:type => ::Thrift::Types::I64, :name => 'timestamp', :optional => true},
             REVISION => {:type => ::Thrift::Types::I64, :name => 'revision', :optional => true},
-            FLAG => {:type => ::Thrift::Types::I16, :name => 'flag', :default => 255}
+            FLAG => {:type => ::Thrift::Types::I32, :name => 'flag', :default =>             255, :enum_class => Hypertable::ThriftGen::KeyFlag}
           }
 
           def struct_fields; FIELDS; end
 
           def validate
+            unless @flag.nil? || Hypertable::ThriftGen::KeyFlag::VALID_VALUES.include?(@flag)
+              raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field flag!')
+            end
           end
 
+          ::Thrift::Struct.generate_accessors self
         end
 
         # Specifies options for a shared periodic mutator
@@ -233,12 +241,11 @@ module Hypertable
         #   <dd>Mutator flags</dt>
         # </dl>
         class MutateSpec
-          include ::Thrift::Struct
+          include ::Thrift::Struct, ::Thrift::Struct_Union
           APPNAME = 1
           FLUSH_INTERVAL = 2
           FLAGS = 3
 
-          ::Thrift::Struct.field_accessor self, :appname, :flush_interval, :flags
           FIELDS = {
             APPNAME => {:type => ::Thrift::Types::STRING, :name => 'appname', :default => %q""},
             FLUSH_INTERVAL => {:type => ::Thrift::Types::I32, :name => 'flush_interval', :default => 1000},
@@ -253,6 +260,7 @@ module Hypertable
             raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field flags is unset!') unless @flags
           end
 
+          ::Thrift::Struct.generate_accessors self
         end
 
         # Defines a table cell
@@ -265,21 +273,50 @@ module Hypertable
         #   <dd>Value of a cell. Currently a sequence of uninterpreted bytes.</dd>
         # </dl>
         class Cell
-          include ::Thrift::Struct
+          include ::Thrift::Struct, ::Thrift::Struct_Union
           KEY = 1
           VALUE = 2
 
-          ::Thrift::Struct.field_accessor self, :key, :value
           FIELDS = {
             KEY => {:type => ::Thrift::Types::STRUCT, :name => 'key', :class => Hypertable::ThriftGen::Key},
-            VALUE => {:type => ::Thrift::Types::STRING, :name => 'value', :optional => true}
+            VALUE => {:type => ::Thrift::Types::STRING, :name => 'value', :binary => true, :optional => true}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+          end
+
+          ::Thrift::Struct.generate_accessors self
+        end
+
+        # Defines an individual namespace listing
+        # 
+        # <dl>
+        #   <dt>name</dt>
+        #   <dd>Name of the listing.</dd>
+        # 
+        #   <dt>is_namespace</dt>
+        #   <dd>true if this entry is a namespace.</dd>
+        # </dl>
+        class NamespaceListing
+          include ::Thrift::Struct, ::Thrift::Struct_Union
+          NAME = 1
+          IS_NAMESPACE = 2
+
+          FIELDS = {
+            NAME => {:type => ::Thrift::Types::STRING, :name => 'name'},
+            IS_NAMESPACE => {:type => ::Thrift::Types::BOOL, :name => 'is_namespace'}
           }
 
           def struct_fields; FIELDS; end
 
           def validate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field name is unset!') unless @name
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field is_namespace is unset!') if @is_namespace.nil?
           end
 
+          ::Thrift::Struct.generate_accessors self
         end
 
         # Defines a table split
@@ -298,13 +335,12 @@ module Hypertable
         #   <dd>The IP address of the split.</dd>
         # </dl>
         class TableSplit
-          include ::Thrift::Struct
+          include ::Thrift::Struct, ::Thrift::Struct_Union
           START_ROW = 1
           END_ROW = 2
           LOCATION = 3
           IP_ADDRESS = 4
 
-          ::Thrift::Struct.field_accessor self, :start_row, :end_row, :location, :ip_address
           FIELDS = {
             START_ROW => {:type => ::Thrift::Types::STRING, :name => 'start_row', :optional => true},
             END_ROW => {:type => ::Thrift::Types::STRING, :name => 'end_row', :optional => true},
@@ -317,6 +353,135 @@ module Hypertable
           def validate
           end
 
+          ::Thrift::Struct.generate_accessors self
+        end
+
+        # Describes a ColumnFamily
+        # <dl>
+        #   <dt>name</dt>
+        #   <dd>Name of the column family</dd>
+        # 
+        #   <dt>ag</dt>
+        #   <dd>Name of the access group for this CF</dd>
+        # 
+        #   <dt>max_versions</dt>
+        #   <dd>Max versions of the same cell to be stored</dd>
+        # 
+        #   <dt>ttl</dt>
+        #   <dd>Time to live for cells in the CF (ie delete cells older than this time)</dd>
+        # </dl>
+        class ColumnFamily
+          include ::Thrift::Struct, ::Thrift::Struct_Union
+          NAME = 1
+          AG = 2
+          MAX_VERSIONS = 3
+          TTL = 4
+
+          FIELDS = {
+            NAME => {:type => ::Thrift::Types::STRING, :name => 'name', :optional => true},
+            AG => {:type => ::Thrift::Types::STRING, :name => 'ag', :optional => true},
+            MAX_VERSIONS => {:type => ::Thrift::Types::I32, :name => 'max_versions', :optional => true},
+            TTL => {:type => ::Thrift::Types::STRING, :name => 'ttl', :optional => true}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+          end
+
+          ::Thrift::Struct.generate_accessors self
+        end
+
+        # Describes an AccessGroup
+        # <dl>
+        #   <dt>name</dt>
+        #   <dd>Name of the access group</dd>
+        # 
+        #   <dt>in_memory</dt>
+        #   <dd>Is this access group in memory</dd>
+        # 
+        #   <dt>replication</dt>
+        #   <dd>Replication factor for this AG</dd>
+        # 
+        #   <dt>blocksize</dt>
+        #   <dd>Specifies blocksize for this AG</dd>
+        # 
+        #   <dt>compressor</dt>
+        #   <dd>Specifies compressor for this AG</dd>
+        # 
+        #   <dt>bloom_filter</dt>
+        #   <dd>Specifies bloom filter type</dd>
+        # 
+        #   <dt>columns</dt>
+        #   <dd>Specifies list of column families in this AG</dd>
+        # </dl>
+        class AccessGroup
+          include ::Thrift::Struct, ::Thrift::Struct_Union
+          NAME = 1
+          IN_MEMORY = 2
+          REPLICATION = 3
+          BLOCKSIZE = 4
+          COMPRESSOR = 5
+          BLOOM_FILTER = 6
+          COLUMNS = 7
+
+          FIELDS = {
+            NAME => {:type => ::Thrift::Types::STRING, :name => 'name', :optional => true},
+            IN_MEMORY => {:type => ::Thrift::Types::BOOL, :name => 'in_memory', :optional => true},
+            REPLICATION => {:type => ::Thrift::Types::I16, :name => 'replication', :optional => true},
+            BLOCKSIZE => {:type => ::Thrift::Types::I32, :name => 'blocksize', :optional => true},
+            COMPRESSOR => {:type => ::Thrift::Types::STRING, :name => 'compressor', :optional => true},
+            BLOOM_FILTER => {:type => ::Thrift::Types::STRING, :name => 'bloom_filter', :optional => true},
+            COLUMNS => {:type => ::Thrift::Types::LIST, :name => 'columns', :element => {:type => ::Thrift::Types::STRUCT, :class => Hypertable::ThriftGen::ColumnFamily}, :optional => true}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+          end
+
+          ::Thrift::Struct.generate_accessors self
+        end
+
+        # Describes a schema
+        # <dl>
+        #   <dt>name</dt>
+        #   <dd>Name of the access group</dd>
+        # 
+        #   <dt>in_memory</dt>
+        #   <dd>Is this access group in memory</dd>
+        # 
+        #   <dt>replication</dt>
+        #   <dd>Replication factor for this AG</dd>
+        # 
+        #   <dt>blocksize</dt>
+        #   <dd>Specifies blocksize for this AG</dd>
+        # 
+        #   <dt>compressor</dt>
+        #   <dd>Specifies compressor for this AG</dd>
+        # 
+        #   <dt>bloom_filter</dt>
+        #   <dd>Specifies bloom filter type</dd>
+        # 
+        #   <dt>columns</dt>
+        #   <dd>Specifies list of column families in this AG</dd>
+        # </dl>
+        class Schema
+          include ::Thrift::Struct, ::Thrift::Struct_Union
+          ACCESS_GROUPS = 1
+          COLUMN_FAMILIES = 2
+
+          FIELDS = {
+            ACCESS_GROUPS => {:type => ::Thrift::Types::MAP, :name => 'access_groups', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRUCT, :class => Hypertable::ThriftGen::AccessGroup}, :optional => true},
+            COLUMN_FAMILIES => {:type => ::Thrift::Types::MAP, :name => 'column_families', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRUCT, :class => Hypertable::ThriftGen::ColumnFamily}, :optional => true}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+          end
+
+          ::Thrift::Struct.generate_accessors self
         end
 
         # Exception for thrift clients.
@@ -329,11 +494,10 @@ module Hypertable
         # Note: some languages (like php) don't have adequate namespace, so Exception
         # would conflict with language builtins.
         class ClientException < ::Thrift::Exception
-          include ::Thrift::Struct
+          include ::Thrift::Struct, ::Thrift::Struct_Union
           CODE = 1
           MESSAGE = 2
 
-          ::Thrift::Struct.field_accessor self, :code, :message
           FIELDS = {
             CODE => {:type => ::Thrift::Types::I32, :name => 'code'},
             MESSAGE => {:type => ::Thrift::Types::STRING, :name => 'message'}
@@ -344,6 +508,7 @@ module Hypertable
           def validate
           end
 
+          ::Thrift::Struct.generate_accessors self
         end
 
       end

data/lib/hypertable/gen-rb/hql_service.rb

@@ -14,13 +14,13 @@ require 'hql_types'
               class Client < Hypertable::ThriftGen::ClientService::Client 
                 include ::Thrift::Client
 
-                def hql_exec(command, noflush, unbuffered)
-                  send_hql_exec(command, noflush, unbuffered)
+                def hql_exec(ns, command, noflush, unbuffered)
+                  send_hql_exec(ns, command, noflush, unbuffered)
                   return recv_hql_exec()
                 end
 
-                def send_hql_exec(command, noflush, unbuffered)
-                  send_message('hql_exec', Hql_exec_args, :command => command, :noflush => noflush, :unbuffered => unbuffered)
+                def send_hql_exec(ns, command, noflush, unbuffered)
+                  send_message('hql_exec', Hql_exec_args, :ns => ns, :command => command, :noflush => noflush, :unbuffered => unbuffered)
                 end
 
                 def recv_hql_exec()
@@ -30,13 +30,13 @@ require 'hql_types'
                   raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'hql_exec failed: unknown result')
                 end
 
-                def hql_query(command)
-                  send_hql_query(command)
+                def hql_query(ns, command)
+                  send_hql_query(ns, command)
                   return recv_hql_query()
                 end
 
-                def send_hql_query(command)
-                  send_message('hql_query', Hql_query_args, :command => command)
+                def send_hql_query(ns, command)
+                  send_message('hql_query', Hql_query_args, :ns => ns, :command => command)
                 end
 
                 def recv_hql_query()
@@ -46,13 +46,13 @@ require 'hql_types'
                   raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'hql_query failed: unknown result')
                 end
 
-                def hql_exec2(command, noflush, unbuffered)
-                  send_hql_exec2(command, noflush, unbuffered)
+                def hql_exec2(ns, command, noflush, unbuffered)
+                  send_hql_exec2(ns, command, noflush, unbuffered)
                   return recv_hql_exec2()
                 end
 
-                def send_hql_exec2(command, noflush, unbuffered)
-                  send_message('hql_exec2', Hql_exec2_args, :command => command, :noflush => noflush, :unbuffered => unbuffered)
+                def send_hql_exec2(ns, command, noflush, unbuffered)
+                  send_message('hql_exec2', Hql_exec2_args, :ns => ns, :command => command, :noflush => noflush, :unbuffered => unbuffered)
                 end
 
                 def recv_hql_exec2()
@@ -62,13 +62,13 @@ require 'hql_types'
                   raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'hql_exec2 failed: unknown result')
                 end
 
-                def hql_query2(command)
-                  send_hql_query2(command)
+                def hql_query2(ns, command)
+                  send_hql_query2(ns, command)
                   return recv_hql_query2()
                 end
 
-                def send_hql_query2(command)
-                  send_message('hql_query2', Hql_query2_args, :command => command)
+                def send_hql_query2(ns, command)
+                  send_message('hql_query2', Hql_query2_args, :ns => ns, :command => command)
                 end
 
                 def recv_hql_query2()
@@ -87,7 +87,7 @@ require 'hql_types'
                   args = read_args(iprot, Hql_exec_args)
                   result = Hql_exec_result.new()
                   begin
-                    result.success = @handler.hql_exec(args.command, args.noflush, args.unbuffered)
+                    result.success = @handler.hql_exec(args.ns, args.command, args.noflush, args.unbuffered)
                   rescue Hypertable::ThriftGen::ClientException => e
                     result.e = e
                   end
@@ -98,7 +98,7 @@ require 'hql_types'
                   args = read_args(iprot, Hql_query_args)
                   result = Hql_query_result.new()
                   begin
-                    result.success = @handler.hql_query(args.command)
+                    result.success = @handler.hql_query(args.ns, args.command)
                   rescue Hypertable::ThriftGen::ClientException => e
                     result.e = e
                   end
@@ -109,7 +109,7 @@ require 'hql_types'
                   args = read_args(iprot, Hql_exec2_args)
                   result = Hql_exec2_result.new()
                   begin
-                    result.success = @handler.hql_exec2(args.command, args.noflush, args.unbuffered)
+                    result.success = @handler.hql_exec2(args.ns, args.command, args.noflush, args.unbuffered)
                   rescue Hypertable::ThriftGen::ClientException => e
                     result.e = e
                   end
@@ -120,7 +120,7 @@ require 'hql_types'
                   args = read_args(iprot, Hql_query2_args)
                   result = Hql_query2_result.new()
                   begin
-                    result.success = @handler.hql_query2(args.command)
+                    result.success = @handler.hql_query2(args.ns, args.command)
                   rescue Hypertable::ThriftGen::ClientException => e
                     result.e = e
                   end
@@ -132,13 +132,14 @@ require 'hql_types'
               # HELPER FUNCTIONS AND STRUCTURES
 
               class Hql_exec_args
-                include ::Thrift::Struct
-                COMMAND = 1
-                NOFLUSH = 2
-                UNBUFFERED = 3
+                include ::Thrift::Struct, ::Thrift::Struct_Union
+                NS = 1
+                COMMAND = 2
+                NOFLUSH = 3
+                UNBUFFERED = 4
 
-                ::Thrift::Struct.field_accessor self, :command, :noflush, :unbuffered
                 FIELDS = {
+                  NS => {:type => ::Thrift::Types::I64, :name => 'ns'},
                   COMMAND => {:type => ::Thrift::Types::STRING, :name => 'command'},
                   NOFLUSH => {:type => ::Thrift::Types::BOOL, :name => 'noflush', :default => false},
                   UNBUFFERED => {:type => ::Thrift::Types::BOOL, :name => 'unbuffered', :default => false}
@@ -149,14 +150,14 @@ require 'hql_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
               class Hql_exec_result
-                include ::Thrift::Struct
+                include ::Thrift::Struct, ::Thrift::Struct_Union
                 SUCCESS = 0
                 E = 1
 
-                ::Thrift::Struct.field_accessor self, :success, :e
                 FIELDS = {
                   SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => Hypertable::ThriftGen::HqlResult},
                   E => {:type => ::Thrift::Types::STRUCT, :name => 'e', :class => Hypertable::ThriftGen::ClientException}
@@ -167,14 +168,16 @@ require 'hql_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
               class Hql_query_args
-                include ::Thrift::Struct
-                COMMAND = 1
+                include ::Thrift::Struct, ::Thrift::Struct_Union
+                NS = 1
+                COMMAND = 2
 
-                ::Thrift::Struct.field_accessor self, :command
                 FIELDS = {
+                  NS => {:type => ::Thrift::Types::I64, :name => 'ns'},
                   COMMAND => {:type => ::Thrift::Types::STRING, :name => 'command'}
                 }
 
@@ -183,14 +186,14 @@ require 'hql_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
               class Hql_query_result
-                include ::Thrift::Struct
+                include ::Thrift::Struct, ::Thrift::Struct_Union
                 SUCCESS = 0
                 E = 1
 
-                ::Thrift::Struct.field_accessor self, :success, :e
                 FIELDS = {
                   SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => Hypertable::ThriftGen::HqlResult},
                   E => {:type => ::Thrift::Types::STRUCT, :name => 'e', :class => Hypertable::ThriftGen::ClientException}
@@ -201,16 +204,18 @@ require 'hql_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
               class Hql_exec2_args
-                include ::Thrift::Struct
-                COMMAND = 1
-                NOFLUSH = 2
-                UNBUFFERED = 3
+                include ::Thrift::Struct, ::Thrift::Struct_Union
+                NS = 1
+                COMMAND = 2
+                NOFLUSH = 3
+                UNBUFFERED = 4
 
-                ::Thrift::Struct.field_accessor self, :command, :noflush, :unbuffered
                 FIELDS = {
+                  NS => {:type => ::Thrift::Types::I64, :name => 'ns'},
                   COMMAND => {:type => ::Thrift::Types::STRING, :name => 'command'},
                   NOFLUSH => {:type => ::Thrift::Types::BOOL, :name => 'noflush', :default => false},
                   UNBUFFERED => {:type => ::Thrift::Types::BOOL, :name => 'unbuffered', :default => false}
@@ -221,14 +226,14 @@ require 'hql_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
               class Hql_exec2_result
-                include ::Thrift::Struct
+                include ::Thrift::Struct, ::Thrift::Struct_Union
                 SUCCESS = 0
                 E = 1
 
-                ::Thrift::Struct.field_accessor self, :success, :e
                 FIELDS = {
                   SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => Hypertable::ThriftGen::HqlResult2},
                   E => {:type => ::Thrift::Types::STRUCT, :name => 'e', :class => Hypertable::ThriftGen::ClientException}
@@ -239,14 +244,16 @@ require 'hql_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
               class Hql_query2_args
-                include ::Thrift::Struct
-                COMMAND = 1
+                include ::Thrift::Struct, ::Thrift::Struct_Union
+                NS = 1
+                COMMAND = 2
 
-                ::Thrift::Struct.field_accessor self, :command
                 FIELDS = {
+                  NS => {:type => ::Thrift::Types::I64, :name => 'ns'},
                   COMMAND => {:type => ::Thrift::Types::STRING, :name => 'command'}
                 }
 
@@ -255,14 +262,14 @@ require 'hql_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
               class Hql_query2_result
-                include ::Thrift::Struct
+                include ::Thrift::Struct, ::Thrift::Struct_Union
                 SUCCESS = 0
                 E = 1
 
-                ::Thrift::Struct.field_accessor self, :success, :e
                 FIELDS = {
                   SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => Hypertable::ThriftGen::HqlResult2},
                   E => {:type => ::Thrift::Types::STRUCT, :name => 'e', :class => Hypertable::ThriftGen::ClientException}
@@ -273,6 +280,7 @@ require 'hql_types'
                 def validate
                 end
 
+                ::Thrift::Struct.generate_accessors self
               end
 
             end

data/lib/hypertable/gen-rb/hql_types.rb

@@ -25,13 +25,12 @@ module Hypertable
         #   <dd>Resulting mutator ID for unflushed modifying queries</dd>
         # </dl>
         class HqlResult
-          include ::Thrift::Struct
+          include ::Thrift::Struct, ::Thrift::Struct_Union
           RESULTS = 1
           CELLS = 2
           SCANNER = 3
           MUTATOR = 4
 
-          ::Thrift::Struct.field_accessor self, :results, :cells, :scanner, :mutator
           FIELDS = {
             RESULTS => {:type => ::Thrift::Types::LIST, :name => 'results', :element => {:type => ::Thrift::Types::STRING}, :optional => true},
             CELLS => {:type => ::Thrift::Types::LIST, :name => 'cells', :element => {:type => ::Thrift::Types::STRUCT, :class => Hypertable::ThriftGen::Cell}, :optional => true},
@@ -44,17 +43,17 @@ module Hypertable
           def validate
           end
 
+          ::Thrift::Struct.generate_accessors self
         end
 
         # Same as HqlResult except with cell as array
         class HqlResult2
-          include ::Thrift::Struct
+          include ::Thrift::Struct, ::Thrift::Struct_Union
           RESULTS = 1
           CELLS = 2
           SCANNER = 3
           MUTATOR = 4
 
-          ::Thrift::Struct.field_accessor self, :results, :cells, :scanner, :mutator
           FIELDS = {
             RESULTS => {:type => ::Thrift::Types::LIST, :name => 'results', :element => {:type => ::Thrift::Types::STRING}, :optional => true},
             CELLS => {:type => ::Thrift::Types::LIST, :name => 'cells', :element => {:type => ::Thrift::Types::LIST, :element => {:type => ::Thrift::Types::STRING}}, :optional => true},
@@ -67,6 +66,7 @@ module Hypertable
           def validate
           end
 
+          ::Thrift::Struct.generate_accessors self
         end
 
       end