td 0.16.3 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 07bd70e5cee714b760756d94558404b9ecc4598c9c9c5a16794f4e15cb61a8a5
-  data.tar.gz: ddc1af1f1076065a2e71e7f52b0efb7494cd1c85d3262bcafee94224c039821c
+SHA1:
+  metadata.gz: 2f0c51098af9b5cb3c28528a4d8ec826f5e0fef8
+  data.tar.gz: 707683b4efae2ff6541e9f6327002cc3c55b83d1
 SHA512:
-  metadata.gz: 93357bcda065b255b1e8d4f2e1318c05f5a00981a85fae7bfaf6c2c80cc9e81e55def7153323a7e2376ea5faff67273ff4e3bf24bdd2e71d7d5d0852989ecf2b
-  data.tar.gz: b8ad6a5ad0c55fe8b06edb55468b58c1f0ef2d5c59ee1f97f0e25b40cf4670b43f41574303dea9a065388f7ad8f2c258de0a605137ce2b84ca2989496a1ad7f7
+  metadata.gz: 22e82bcaaaa048e1740059f32852aa1bf1908ad2ee655b7e497f5a58083e317bc713e9db2ca31758d2b243ee49ef5c1ab3c83b4e700f36910fc354a8f20f034f
+  data.tar.gz: '08888013e2bad1e89cd0f35593efe764bf65191d0f8f1e0ed2a3199635dea8e014ca23ba3540a24a7cc5e4851462e5ea163749f7893eed1d112251e8359caaef'

data/ChangeLog

@@ -1,3 +1,7 @@
+== 2018-12-03 version 0.16.4
+
+* Support engine versions for query and schedule (EXPERIMENTAL) #216
+
 == 2018-11-21 version 0.16.3
 
 * Support running status of job for td export:result command #207

data/lib/td/command/query.rb

@@ -21,6 +21,7 @@ module Command
     exclude = false
     pool_name = nil
     domain_key = nil
+    engine_version = nil
 
     op.on('-d', '--database DB_NAME', 'use the database (required)') {|s|
       db_name = s
@@ -90,6 +91,9 @@ module Command
     op.on('--domain-key DOMAIN_KEY', 'optional user-provided unique ID. You can include this ID with your `create` request to ensure idempotence') {|s|
       domain_key = s
     }
+    op.on('--engine-version ENGINE_VERSION', 'EXPERIMENTAL: specify query engine version by name') {|s|
+      engine_version = s
+    }
 
     sql = op.cmd_parse
 
@@ -140,6 +144,7 @@ module Command
     opts['type'] = type if type
     opts['pool_name'] = pool_name if pool_name
     opts['domain_key'] = domain_key if domain_key
+    opts['engine_version'] = engine_version if engine_version
     job = client.query(db_name, sql, result_url, priority, retry_limit, opts)
 
     $stdout.puts "Job #{job.job_id} is queued."

data/lib/td/command/sched.rb

@@ -39,6 +39,7 @@ module Command
     query = nil
     retry_limit = nil
     type = nil
+    engine_version = nil
 
     op.on('-d', '--database DB_NAME', 'use the database (required)') {|s|
       db_name = s
@@ -79,6 +80,9 @@ module Command
     op.on('-T', '--type TYPE', 'set query type (hive)') {|s|
       type = s
     }
+    op.on('--engine-version ENGINE_VERSION', 'EXPERIMENTAL: specify query engine version by name') {|s|
+      engine_version = s
+    }
 
     name, cron, sql = op.cmd_parse
 
@@ -109,7 +113,7 @@ module Command
     get_database(client, db_name)
 
     begin
-      first_time = client.create_schedule(name, :cron=>cron, :query=>sql, :database=>db_name, :result=>result_url, :timezone=>timezone, :delay=>delay, :priority=>priority, :retry_limit=>retry_limit, :type=>type)
+      first_time = client.create_schedule(name, :cron=>cron, :query=>sql, :database=>db_name, :result=>result_url, :timezone=>timezone, :delay=>delay, :priority=>priority, :retry_limit=>retry_limit, :type=>type, :engine_version=>engine_version)
     rescue AlreadyExistsError
       cmd_debug_error $!
       $stderr.puts "Schedule '#{name}' already exists."
@@ -153,6 +157,7 @@ module Command
     priority = nil
     retry_limit = nil
     type = nil
+    engine_version = nil
 
     op.on('-n', '--newname NAME', 'change the schedule\'s name') {|n|
       newname = n
@@ -193,6 +198,9 @@ module Command
     op.on('-T', '--type TYPE', 'set query type (hive)') {|s|
       type = s
     }
+    op.on('--engine-version ENGINE_VERSION', 'EXPERIMENTAL: specify query engine version by name') {|s|
+      engine_version = s
+    }
 
     curname = op.cmd_parse
 
@@ -207,6 +215,7 @@ module Command
     params['priority'] = priority.to_s if priority
     params['retry_limit'] = retry_limit.to_s if retry_limit
     params['type'] = type.to_s if type
+    params['engine_version'] = engine_version if engine_version
 
     if params.empty?
       $stderr.puts op.to_s

data/lib/td/version.rb

@@ -1,3 +1,3 @@
 module TreasureData
-  TOOLBELT_VERSION = '0.16.3'
+  TOOLBELT_VERSION = '0.16.4'
 end

data/spec/td/command/query_spec.rb

@@ -102,5 +102,15 @@ module TreasureData::Command
         end
       end
     end
+
+    describe 'engine version' do
+      it 'accepts --engine-version' do
+        expect(client).to receive(:query).
+          with("sample_datasets", "SELECT 1;", nil, nil, nil, {"engine_version"=>"stable"}).
+          and_return(job)
+        op = List::CommandParser.new("query", %w[query], %w[], nil, ['--engine-version=stable', '-dsample_datasets', 'SELECT 1;'], false)
+        command.query(op)
+      end
+    end
   end
 end

data/spec/td/command/sched_spec.rb

@@ -27,6 +27,59 @@ module TreasureData::Command
       allow(command).to receive(:get_client).and_return(client)
     end
 
+    describe 'sched_create' do
+      before do
+        expect(client).to receive(:database).with('sample_datasets')
+      end
+
+      describe 'engine version' do
+        let(:op) {
+          List::CommandParser.new(
+            'sched:create',
+            %w[name cron sql],
+            %w[],
+            false,
+            ['--engine-version=stable', '-dsample_datasets', 'sched1', '0 * * * *', 'select count(*) from table1'],
+            false
+          )
+        }
+
+        it 'accepts --engine-version' do
+          expect(client).to receive(:create_schedule).
+            with(
+              "sched1",
+              {
+                cron: '0 * * * *',
+                query: 'select count(*) from table1',
+                database: 'sample_datasets',
+                result: nil,
+                timezone: nil,
+                delay: 0,
+                priority: nil,
+                retry_limit: nil,
+                type: nil,
+                engine_version: "stable"
+              }
+            ).
+            and_return(nil)
+          command.sched_create(op)
+        end
+      end
+    end
+
+    describe 'sched_update' do
+      describe 'engine version' do
+        let(:op) { List::CommandParser.new('sched:update', %w[name], %w[], false, ['--engine-version=stable', 'old_name'], false) }
+
+        it 'accepts --engine-version' do
+          expect(client).to receive(:update_schedule).
+            with("old_name", {"engine_version"=>"stable"}).
+            and_return(nil)
+          command.sched_update(op)
+        end
+      end
+    end
+
     describe 'sched_history' do
       before do
         allow(client).to receive(:history).and_return(history)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.16.4
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2018-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -309,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing