td-client 0.8.41 → 0.8.42

data/ChangeLog

@@ -1,3 +1,9 @@
+== 2012-01-16 version 0.8.42
+
+* Added retry_limit to job and schedule APIs
+* Increased table/database name limit from 32 to 256
+
+
 == 2012-01-10 version 0.8.41
 
 * Fix API#job_result_format to handle Content-Encoding properly

data/lib/td/client.rb

@@ -120,31 +120,31 @@ class Client
   end
 
   # => Job
-  def query(db_name, q, result_url=nil, priority=nil)
-    job_id = @api.hive_query(q, db_name, result_url, priority)
+  def query(db_name, q, result_url=nil, priority=nil, retry_limit=nil)
+    job_id = @api.hive_query(q, db_name, result_url, priority, retry_limit)
     Job.new(self, job_id, :hive, q)
   end
 
   # => [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,org,db|
-      Job.new(self, job_id, type, query, status, nil, nil, start_at, end_at, nil, result_url, nil, priority, org, db)
+    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)
     }
   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, 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, org, db)
+    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)
   end
 
   # => type:Symbol, url:String
   def job_status(job_id)
     # use v3/job/status instead of v3/job/show to poll finish of a job
-    type, query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority, org, db = @api.show_job(job_id)
-    return query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority, org, db
+    type, query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority, retry_limit, org, db = @api.show_job(job_id)
+    return query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority, retry_limit, org, db
   end
 
   # => result:[{column:String=>value:Object]
@@ -252,8 +252,8 @@ class Client
   # [Schedule]
   def schedules
     result = @api.list_schedules
-    result.map {|name,cron,query,database,result_url,timezone,delay,next_time,priority,org_name|
-      Schedule.new(self, name, cron, query, database, result_url, timezone, delay, next_time, priority, org_name)
+    result.map {|name,cron,query,database,result_url,timezone,delay,next_time,priority,retry_limit,org_name|
+      Schedule.new(self, name, cron, query, database, result_url, timezone, delay, next_time, priority, retry_limit, org_name)
     }
   end
 
@@ -267,7 +267,7 @@ class Client
     result = @api.history(name, from, to)
     result.map {|scheduled_at,job_id,type,status,query,start_at,end_at,result_url,priority,database|
       # TODO org
-      ScheduledJob.new(self, scheduled_at, job_id, type, query, status, nil, nil, start_at, end_at, nil, result_url, nil, priority,nil,database)
+      ScheduledJob.new(self, scheduled_at, job_id, type, query, status, nil, nil, start_at, end_at, nil, result_url, nil, priority,nil,nil,database)
     }
   end
 

data/lib/td/client/api.rb

@@ -115,8 +115,8 @@ class API
     if name.length < 3
       name += "_"*(3-name.length)
     end
-    if 32 < name.length
-      name = name[0,30]+"__"
+    if 256 < name.length
+      name = name[0,254]+"__"
     end
     name = name.downcase
     name = name.gsub(/[^a-z0-9_]/, '_')
@@ -359,8 +359,9 @@ class API
       end_at = m['end_at']
       result_url = m['result']
       priority = m['priority']
+      retry_limit = m['retry_limit']
       organization = m['organization']
-      result << [job_id, type, status, query, start_at, end_at, result_url, priority, organization, database]
+      result << [job_id, type, status, query, start_at, end_at, result_url, priority, retry_limit, organization, database]
     }
     return result
   end
@@ -390,8 +391,9 @@ class API
       hive_result_schema = JSON.parse(hive_result_schema)
     end
     priority = js['priority']
+    retry_limit = js['retry_limit']
     organization = js['organization']
-    return [type, query, status, url, debug, start_at, end_at, result, hive_result_schema, priority, organization, database]
+    return [type, query, status, url, debug, start_at, end_at, result, hive_result_schema, priority, retry_limit, organization, database]
   end
 
   def job_result(job_id)
@@ -460,10 +462,11 @@ class API
   end
 
   # => jobId:String
-  def hive_query(q, db=nil, result_url=nil, priority=nil)
+  def hive_query(q, db=nil, result_url=nil, priority=nil, retry_limit=nil)
     params = {'query' => q}
     params['result'] = result_url if result_url
     params['priority'] = priority if priority
+    params['retry_limit'] = retry_limit if retry_limit
     code, body, res = post("/v3/job/issue/hive/#{e db}", params)
     if code != "200"
       raise_error("Query failed", res)
@@ -690,8 +693,9 @@ class API
       delay = m['delay']
       next_time = m['next_time']
       priority = m['priority']
+      retry_limit = m['retry_limit']
       organization = m['organization']
-      result << [name, cron, query, database, result_url, timezone, delay, next_time, priority, organization]
+      result << [name, cron, query, database, result_url, timezone, delay, next_time, priority, retry_limit, organization]
     }
     return result
   end

data/lib/td/client/model.rb

@@ -226,7 +226,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, 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, 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
@@ -240,12 +240,13 @@ class Job < Model
     @result_url = result_url
     @hive_result_schema = hive_result_schema
     @priority = priority
+    @retry_limit = retry_limit
     @org_name = org_name
     @db_name = db_name
   end
 
   attr_reader :job_id, :type, :result_url
-  attr_reader :hive_result_schema, :priority, :org_name, :db_name
+  attr_reader :hive_result_schema, :priority, :retry_limit, :org_name, :db_name
 
   def wait(timeout=nil)
     # TODO
@@ -336,7 +337,7 @@ class Job < Model
   end
 
   def update_status!
-    query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority, org_name, db_name = @client.job_status(@job_id)
+    query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority, retry_limit, org_name, db_name = @client.job_status(@job_id)
     @query = query
     @status = status
     @url = url
@@ -344,6 +345,8 @@ class Job < Model
     @start_at = start_at
     @end_at = end_at
     @hive_result_schema = hive_result_schema
+    @priority = priority
+    @retry_limit = retry_limit
     @org_name = org_name
     @db_name = db_name
     self
@@ -364,7 +367,7 @@ end
 
 
 class Schedule < Model
-  def initialize(client, name, cron, query, database=nil, result_url=nil, timezone=nil, delay=nil, next_time=nil, priority=nil, org_name=nil)
+  def initialize(client, name, cron, query, database=nil, result_url=nil, timezone=nil, delay=nil, next_time=nil, priority=nil, retry_limit=nil, org_name=nil)
     super(client)
     @name = name
     @cron = cron
@@ -375,10 +378,11 @@ class Schedule < Model
     @delay = delay
     @next_time = next_time
     @priority = priority
+    @retry_limit = retry_limit
     @org_name = org_name
   end
 
-  attr_reader :name, :cron, :query, :database, :result_url, :timezone, :delay, :priority, :org_name
+  attr_reader :name, :cron, :query, :database, :result_url, :timezone, :delay, :priority, :retry_limit, :org_name
 
   def next_time
     @next_time ? Time.parse(@next_time) : nil

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.8.41'
+VERSION = '0.8.42'
 
 end

data/spec/api_spec.rb

@@ -12,7 +12,7 @@ describe API do
 
   INVALID_NAMES = {
     'a' => 'a__',
-    'a'*33 => 'a'*30+'__',
+    'a'*257 => 'a'*254+'__',
     'abcD' => 'abcd',
     'a-b*' => 'a_b_',
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.41
+  version: 0.8.42
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack