td-client 0.8.58 → 0.8.59

data/lib/td/client.rb

@@ -137,16 +137,16 @@ class Client
   # => [Job]
   def jobs(from=nil, to=nil, status=nil, conditions=nil)
     result = @api.list_jobs(from, to, status, conditions)
-    result.map {|job_id,type,status,query,start_at,end_at,result_url,priority,retry_limit,org,db|
-      Job.new(self, job_id, type, query, status, nil, nil, start_at, end_at, nil, result_url, nil, priority, retry_limit, org, db)
+    result.map {|job_id, type, status, query, start_at, end_at, cpu_time, result_url, priority, retry_limit, org, db|
+      Job.new(self, job_id, type, query, status, nil, nil, start_at, end_at, cpu_time, nil, result_url, nil, priority, retry_limit, org, db)
     }
   end
 
   # => Job
   def job(job_id)
     job_id = job_id.to_s
-    type, query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority, retry_limit, org, db = @api.show_job(job_id)
-    Job.new(self, job_id, type, query, status, url, debug, start_at, end_at, nil, result_url, hive_result_schema, priority, retry_limit, org, db)
+    type, query, status, url, debug, start_at, end_at, cpu_time, result_url, hive_result_schema, priority, retry_limit, org, db = @api.show_job(job_id)
+    Job.new(self, job_id, type, query, status, url, debug, start_at, end_at, cpu_time, nil, result_url, hive_result_schema, priority, retry_limit, org, db)
   end
 
   # => status:String
@@ -227,7 +227,7 @@ class Client
     data = @api.show_bulk_import(name)
     BulkImport.new(self, data)
   end
-  
+
   # => [BulkImport]
   def bulk_imports
     @api.list_bulk_imports.map {|data|

data/lib/td/client/api.rb

@@ -6,6 +6,9 @@ module TreasureData
 class APIError < StandardError
 end
 
+class ParameterValidationError < StandardError
+end
+
 class AuthError < APIError
 end
 
@@ -101,39 +104,44 @@ class API
     record.to_msgpack(out)
   end
 
-  def self.validate_database_name(name)
+  def self.validate_name(target, min_len, max_len, name)
+    if !target.instance_of?(String) || target.empty?
+      raise ParameterValidationError,
+            "A valid target name is required"
+    end
+
     name = name.to_s
     if name.empty?
-      raise "Empty name is not allowed"
+      raise ParameterValidationError,
+            "Empty #{target} name is not allowed"
     end
-    if name.length < 3 || 256 < name.length
-      raise "Name must be 3 to 256 characters, got #{name.length} characters."
+    if name.length < min_len || name.length > max_len
+      raise ParameterValidationError,
+            "#{target.capitalize} name must be between #{min_len} and #{max_len} characters long. Got #{name.length} " +
+            (name.length == 1 ? "character" : "characters") + "."
     end
     unless name =~ /^([a-z0-9_]+)$/
-      raise "Name must consist only of lower-case alphabets, numbers and '_'."
+      raise ParameterValidationError,
+            "#{target.capitalize} name must only consist of lower-case alpha-numeric characters and '_'."
     end
+
     name
   end
 
+  def self.validate_database_name(name)
+    validate_name("database", 3, 256, name)
+  end
+
   def self.validate_table_name(name)
-    validate_database_name(name)
+    validate_name("table", 3, 256, name)
   end
 
   def self.validate_result_set_name(name)
-    validate_database_name(name)
+    validate_name("result set", 3, 256, name)
   end
 
   def self.validate_column_name(name)
-    name = name.to_s
-    if name.empty?
-      raise "Empty column name is not allowed"
-    end
-    if 256 < name.length
-      raise "Column name must be to 256 characters, got #{name.length} characters."
-    end
-    unless name =~ /^([a-z0-9_]+)$/
-      raise "Column name must consist only of alphabets, numbers, '_'."
-    end
+    validate_name("column", 2, 256, name)
   end
 
   def self.normalize_database_name(name)
@@ -408,10 +416,11 @@ class API
       query = m['query']
       start_at = m['start_at']
       end_at = m['end_at']
+      cpu_time = m['cpu_time']
       result_url = m['result']
       priority = m['priority']
       retry_limit = m['retry_limit']
-      result << [job_id, type, status, query, start_at, end_at, result_url, priority, retry_limit, nil, database] # same as database
+      result << [job_id, type, status, query, start_at, end_at, cpu_time, result_url, priority, retry_limit, nil, database] # same as database
     }
     return result
   end
@@ -433,6 +442,7 @@ class API
     url = js['url']
     start_at = js['start_at']
     end_at = js['end_at']
+    cpu_time = js['cpu_time']
     result = js['result']
     hive_result_schema = (js['hive_result_schema'] || '')
     if hive_result_schema.empty?
@@ -442,7 +452,7 @@ class API
     end
     priority = js['priority']
     retry_limit = js['retry_limit']
-    return [type, query, status, url, debug, start_at, end_at, result, hive_result_schema, priority, retry_limit, nil, database] # same as above
+    return [type, query, status, url, debug, start_at, end_at, cpu_time, result, hive_result_schema, priority, retry_limit, nil, database] # same as above
   end
 
   def job_status(job_id)
@@ -1142,6 +1152,12 @@ class API
       response = http.request(request)
     end
 
+    unless ENV['TD_CLIENT_DEBUG'].nil?
+      puts "DEBUG: REST GET response:"
+      puts "DEBUG:   header: " + response.header.to_s
+      puts "DEBUG:   body:   " + response.body.to_s
+    end
+
     body = response.body
     unless block
       if ce = response.header['content-encoding']
@@ -1269,7 +1285,11 @@ class API
     status_code = res.code.to_s
     begin
       js = JSON.load(res.body)
-      error_msg = js['message'] || js['error']
+      if js.nil?
+        error_msg = res.message
+      else
+        error_msg = js['message'] || js['error']
+      end
 
       if klass
         raise klass, "#{status_code}: #{msg}: #{error_msg}"

data/lib/td/client/model.rb

@@ -237,7 +237,7 @@ class Job < Model
   STATUS_KILLED = "killed"
   FINISHED_STATUS = [STATUS_SUCCESS, STATUS_ERROR, STATUS_KILLED]
 
-  def initialize(client, job_id, type, query, status=nil, url=nil, debug=nil, start_at=nil, end_at=nil, result=nil, result_url=nil, hive_result_schema=nil, priority=nil, retry_limit=nil, org_name=nil, db_name=nil)
+  def initialize(client, job_id, type, query, status=nil, url=nil, debug=nil, start_at=nil, end_at=nil, cpu_time=nil, result=nil, result_url=nil, hive_result_schema=nil, priority=nil, retry_limit=nil, org_name=nil, db_name=nil)
     super(client)
     @job_id = job_id
     @type = type
@@ -247,6 +247,7 @@ class Job < Model
     @debug = debug
     @start_at = start_at
     @end_at = end_at
+    @cpu_time = cpu_time
     @result = result
     @result_url = result_url
     @hive_result_schema = hive_result_schema
@@ -267,35 +268,40 @@ class Job < Model
   end
 
   def query
-    update_status! unless @query
+    update_status! unless @query || finished?
     @query
   end
 
   def status
-    update_status! unless @status
+    update_status! unless @status || finished?
     @status
   end
 
   def url
-    update_status! unless @url
+    update_status! unless @url || finished?
     @url
   end
 
   def debug
-    update_status! unless @debug
+    update_status! unless @debug || finished?
     @debug
   end
 
   def start_at
-    update_status! unless @start_at
+    update_status! unless @start_at || finished?
     @start_at && !@start_at.empty? ? Time.parse(@start_at) : nil
   end
 
   def end_at
-    update_status! unless @end_at
+    update_status! unless @end_at || finished?
     @end_at && !@end_at.empty? ? Time.parse(@end_at) : nil
   end
 
+  def cpu_time
+    update_status! unless @cpu_time || finished?
+    @cpu_time
+  end
+
   def result
     unless @result
       return nil unless finished?

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
   class Client
-    VERSION = '0.8.58'
+    VERSION = '0.8.59'
   end
 end

data/spec/td/client/api_spec.rb

@@ -51,6 +51,7 @@ describe API do
       INVALID_NAMES.each_pair {|ng,ok|
         API.normalize_table_name(ng).should == ok
       }
+      # empty
       lambda {
         API.normalize_table_name('')
       }.should raise_error(RuntimeError)
@@ -64,32 +65,116 @@ describe API do
   end
 
   describe 'validator' do
-    it 'validate_database_name should raise errors' do
-      INVALID_NAMES.each_pair {|ng,ok|
+    describe "'validate_database_name'" do
+      it 'should raise a ParameterValidationError exceptions' do
+        INVALID_NAMES.each_pair {|ng,ok|
+          lambda {
+            API.validate_database_name(ng)
+          }.should raise_error(ParameterValidationError)
+        }
+        # empty
         lambda {
-          API.validate_database_name(ng)
-        }.should raise_error(RuntimeError)
-      }
-      lambda {
-        API.validate_database_name('')
-      }.should raise_error(RuntimeError)
+          API.validate_database_name('')
+        }.should raise_error(ParameterValidationError)
+      end
+
+      it 'should return valid data' do
+        VALID_NAMES.each {|ok|
+          API.validate_database_name(ok).should == ok
+        }
+      end
     end
 
-    it 'validate_table_name should raise errors' do
-      INVALID_NAMES.each_pair {|ng,ok|
+    describe "'validate_table_name'" do
+      it 'should raise a ParameterValidationError exception' do
+        INVALID_NAMES.each_pair {|ng,ok|
+          lambda {
+            API.validate_table_name(ng)
+          }.should raise_error(ParameterValidationError)
+        }
         lambda {
-          API.validate_table_name(ng)
-        }.should raise_error(RuntimeError)
-      }
-      lambda {
-        API.validate_table_name('')
-      }.should raise_error(RuntimeError)
+          API.validate_table_name('')
+        }.should raise_error(ParameterValidationError)
+      end
+
+      it 'should return valid data' do
+        VALID_NAMES.each {|ok|
+          API.validate_database_name(ok).should == ok
+        }
+      end
     end
 
-    it 'validate_database_name should return valid data' do
-      VALID_NAMES.each {|ok|
-        API.validate_database_name(ok)
-      }
+    describe "'validate_result_set_name'" do
+      it 'should raise a ParameterValidationError exception' do
+        INVALID_NAMES.each_pair {|ng,ok|
+          lambda {
+            API.validate_result_set_name(ng)
+          }.should raise_error(ParameterValidationError)
+        }
+        # empty
+        lambda {
+          API.validate_result_set_name('')
+        }.should raise_error(ParameterValidationError)
+      end
+
+      it 'should return valid data' do
+        VALID_NAMES.each {|ok|
+          API.validate_result_set_name(ok).should == ok
+        }
+      end
+    end
+
+    describe "'validate_column_name'" do
+      it 'should raise a ParameterValidationError exception' do
+        INVALID_NAMES.each_pair {|ng,ok|
+          lambda {
+            API.validate_column_name(ng)
+          }.should raise_error(ParameterValidationError)
+        }
+        # empty
+        lambda {
+          API.validate_column_name('')
+        }.should raise_error(ParameterValidationError)
+      end
+
+      it 'should return valid data' do
+        VALID_NAMES.each {|ok|
+          API.validate_column_name(ok).should == ok
+        }
+        # columns can be as short as 2 characters
+        API.validate_column_name('ab').should == 'ab'
+      end
+    end
+
+
+    describe "'generic validate_name'" do
+      it 'should raise a ParameterValidationError exception' do
+        INVALID_NAMES.each_pair {|ng,ok|
+          lambda {
+            API.validate_name("generic", 3, 256, ng)
+          }.should raise_error(ParameterValidationError)
+        }
+        # empty
+        lambda {
+          API.validate_name("generic", 3, 256, '')
+        }.should raise_error(ParameterValidationError)
+        # too short - one less than left limit
+        lambda {
+          API.validate_name("generic", 3, 256, 'ab')
+        }.should raise_error(ParameterValidationError)
+      end
+
+      it 'should return valid data' do
+        VALID_NAMES.each {|ok|
+          API.validate_name("generic", 3, 256, ok).should == ok
+        }
+        # esplore left boundary
+        API.validate_name("generic", 2, 256, 'ab').should == 'ab'
+        API.validate_name("generic", 1, 256, 'a').should == 'a'
+        # explore right boundary
+        API.validate_name("generic", 3, 256, 'a' * 256).should == 'a' * 256
+        API.validate_name("generic", 3, 128, 'a' * 128).should == 'a' * 128
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.58
+  version: 0.8.59
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -191,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4425539738292282351
+      hash: 1351627692478107055
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4425539738292282351
+      hash: 1351627692478107055
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23