lib/grumlin/client.rb in grumlin-0.21.1 vs lib/grumlin/client.rb in grumlin-0.22.0

- old
+ new

@@ -28,16 +28,10 @@ @client.write(bytecode, session_id: session_id) ensure @count += 1 end - def finalize_tx(action, session_id) - @client.finalize_tx(action, session_id) - ensure - @count += 1 - end - def viable? !closed? end def reusable? @@ -102,19 +96,19 @@ # TODO: support yielding def write(bytecode, session_id: nil) raise NotConnectedError unless connected? request = to_query(bytecode, session_id: session_id) - submit_request(request) - end - def finalize_tx(action, session_id) - raise NotConnectedError unless connected? - raise ArgumentError, "session_id cannot be nil" if session_id.nil? - - request = finalize_tx_query(action, session_id) - submit_request(request) + channel = @request_dispatcher.add_request(request) + begin + @transport.write(request) + channel.dequeue.flat_map { |item| Typing.cast(item) } + rescue Async::Stop, Async::TimeoutError + close(check_requests: false) + raise + end end def inspect "<#{self.class} url=#{@url} connected=#{connected?}>" end @@ -123,22 +117,10 @@ inspect end private - def submit_request(request) - channel = @request_dispatcher.add_request(request) - @transport.write(request) - - begin - channel.dequeue.flat_map { |item| Typing.cast(item) } - rescue Async::Stop, Async::TimeoutError - close(check_requests: false) - raise - end - end - # This might be overridden in successors def build_transport Transport.new(@url, parent: @parent, **@client_options) end @@ -149,25 +131,9 @@ processor: session_id ? :session : :traversal, args: { gremlin: { :@type => "g:Bytecode", :@value => bytecode.serialize - }, - aliases: { g: :g }, - session: session_id - }.compact - } - end - - def finalize_tx_query(action, session_id) - { - requestId: SecureRandom.uuid, - op: :bytecode, - processor: session_id ? :session : :traversal, - args: { - gremlin: { - :@type => "g:Bytecode", - :@value => { source: [[:tx, action]] } }, aliases: { g: :g }, session: session_id }.compact }