Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions keymaker.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ Gem::Specification.new do |s|
lib/keymaker/railtie.rb
lib/keymaker/request.rb
lib/keymaker/requests/add_node_to_index_request.rb
lib/keymaker/requests/batch_cypher_request.rb
lib/keymaker/requests/batch_get_nodes_request.rb
lib/keymaker/requests/batch_request.rb
lib/keymaker/requests/create_node_request.rb
Expand All @@ -73,6 +74,7 @@ Gem::Specification.new do |s|
spec/configuration_spec.rb
spec/keymaker/node_spec.rb
spec/keymaker/requests/add_node_to_index_request_spec.rb
spec/keymaker/requests/batch_cypher_request_spec.rb
spec/keymaker/requests/batch_get_nodes_request_spec.rb
spec/keymaker/requests/batch_request_spec.rb
spec/keymaker/requests/create_node_request_spec.rb
Expand Down
1 change: 1 addition & 0 deletions lib/keymaker.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
require 'keymaker/request'

require 'keymaker/requests/batch_request'
require 'keymaker/requests/batch_cypher_request'
require 'keymaker/requests/batch_get_nodes_request'
require 'keymaker/requests/create_node_request'
require 'keymaker/requests/delete_node_request'
Expand Down
6 changes: 6 additions & 0 deletions lib/keymaker/parsers/cypher_response_parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ def self.parse(response_body)
end
end

def self.parse_array(response_array)
response_array.map{|response|
parse(response.body)
}
end

def self.translate_response(response_body, result)
Hashie::Mash.new(Hash[sanitized_column_names(response_body).zip(result)])
end
Expand Down
35 changes: 35 additions & 0 deletions lib/keymaker/requests/batch_cypher_request.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
module Keymaker

class BatchCypherRequest < BatchRequest

attr_accessor :queries

def initialize(service, queries)
self.config = service.config
self.queries = clean_queries(queries)
self.service = service
self.opts = build_job_descriptions_collection
end

def build_job_descriptions_collection
[].tap do |batch_jobs|
queries.each_with_index do |query, job_id|
batch_jobs << {id: job_id, to: '/cypher', method: "POST", body: query}
end
end
end

protected
def clean_queries(queries)
queries.map{ |query|
if query.is_a? String
{ query: query}
else
query
end
}
end

end

end
4 changes: 4 additions & 0 deletions lib/keymaker/service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ def execute_cypher(query, params)
Keymaker::CypherResponseParser.parse(response.body)
end

def execute_cypher_batch(queries)
response = batch_cypher_request(queries)
Keymaker::CypherResponseParser.parse_array(response.body)
end
def execute_script(script, params={})
execute_gremlin_request({script: script, params: params})
end
Expand Down
39 changes: 39 additions & 0 deletions spec/keymaker/requests/batch_cypher_request_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
require 'spec_helper'
require 'keymaker'

describe Keymaker::BatchCypherRequest do

describe "#build_opts_collection" do

context "with simple queries" do

let(:queries) { ['MATCH (n) RETURN COUNT(n)', 'MATCH (n) RETURN n LIMIT 1'] }
let(:batch_cypher_request) do
Keymaker::BatchCypherRequest.new(Keymaker.service, queries)
end

it "builds the job descriptions collection" do
batch_cypher_request.opts.should == [
{id: 0, to: "/cypher", method: "POST", body: { query: 'MATCH (n) RETURN COUNT(n)'}},
{id: 1, to: "/cypher", method: "POST", body: { query: 'MATCH (n) RETURN n LIMIT 1'}},
]
end

end

context "with parametrized query" do

let(:queries) { [{query: 'MATCH (n { property: {property} }) RETURN n', :params => { property: 3 }}] }
let(:batch_cypher_request) do
Keymaker::BatchCypherRequest.new(Keymaker.service, queries)
end

it "builds the job descriptions collection" do
batch_cypher_request.opts.should == [
{id: 0, to: "/cypher", method: "POST", body: {query: 'MATCH (n { property: {property} }) RETURN n', :params => { property: 3 } }}
]
end

end
end
end