tarantool-client 0.1.0 → 0.2.0

data/lib/tarantool/client/tuple_mapping.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module Tarantool
+  class Client
+    # Tuple <-> Hash by the space format, for SpaceInfo. Fields beyond the format are keyed by their 0-based position.
+    # @api private
+    module TupleMapping
+      # A position this far past the format would otherwise let a huge Integer key allocate a giant Array.
+      MAX_POSITIONS_BEYOND_FORMAT = 1024
+
+      def to_hash(tuple)
+        hash = fields.each_with_index.to_h { |field, position| [field.name.to_sym, tuple[position]] }
+        (fields.size...tuple.size).each { |position| hash[position] = tuple[position] }
+
+        hash
+      end
+
+      # A missing field goes out as nil; on 3.x the server applies the field default to nil as well.
+      def to_tuple(hash)
+        positions = fields.each_with_index.to_h { |field, position| [field.name, position] }
+        named_positions = {}
+
+        hash.each_with_object(Array.new(fields.size)) do |(key, value), tuple|
+          position = position_of(key, positions)
+          check_not_duplicate(key, position, named_positions)
+          tuple[position] = value
+        end
+      end
+
+      private
+
+      def position_of(key, positions)
+        case key
+        when Symbol, String
+          positions.fetch(key.to_s) { raise UnknownFieldError, "space #{name} has no field '#{key}'" }
+        when Integer then position_beyond_format(key)
+        else raise ArgumentError, "unsupported key #{key.inspect} for space #{name}"
+        end
+      end
+
+      # `:a` and 'a' name the same field; the later one would otherwise win silently.
+      def check_not_duplicate(key, position, named_positions)
+        return unless key.is_a?(Symbol) || key.is_a?(String)
+        raise ArgumentError, "space #{name} field '#{fields[position].name}' given twice" if named_positions[position]
+
+        named_positions[position] = true
+      end
+
+      def position_beyond_format(position)
+        raise ArgumentError, "position #{position} is negative for space #{name}" if position.negative?
+
+        if position < fields.size
+          raise ArgumentError, "position #{position} is inside the format of space #{name}; use the field name"
+        end
+
+        if position >= fields.size + MAX_POSITIONS_BEYOND_FORMAT
+          raise ArgumentError, "position #{position} is more than #{MAX_POSITIONS_BEYOND_FORMAT} past the format " \
+                               "of space #{name}"
+        end
+
+        position
+      end
+    end
+  end
+end

data/lib/tarantool/client/tuple_shape.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Tarantool
+  class Client
+    # What data operations return for each tuple, chosen with `as:`.
+    # @api private
+    module TupleShape
+      SHAPES = %i[tuple hash row].freeze
+
+      def self.check(shape)
+        return if SHAPES.include?(shape)
+
+        raise ArgumentError, "unknown as: #{shape.inspect}, expected one of #{SHAPES.join(', ')}"
+      end
+
+      def self.apply(shape, tuple, space_info)
+        case shape
+        when :hash then space_info.to_hash(tuple)
+        when :row then Row.new(tuple:, attributes: space_info.to_hash(tuple))
+        else tuple
+        end
+      end
+    end
+  end
+end

data/lib/tarantool/client/version.rb

@@ -2,6 +2,6 @@
 
 module Tarantool
   class Client
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/lib/tarantool/client.rb

@@ -8,6 +8,7 @@ require_relative 'client/errors'
 require_relative 'client/configuration'
 require_relative 'client/backoff'
 require_relative 'client/thread_join'
+require_relative 'client/diagnostics'
 require_relative 'client/protocol/constants'
 require_relative 'client/box_error'
 require_relative 'client/uuid'
@@ -40,6 +41,12 @@ require_relative 'client/protocol/requests/auth'
 require_relative 'client/protocol/requests/id'
 require_relative 'client/protocol/requests/watch'
 require_relative 'client/protocol/requests/unwatch'
+require_relative 'client/instrumentation'
+require_relative 'client/instrumentation/request_payload'
+require_relative 'client/instrumentation/log_lines'
+require_relative 'client/instrumentation/log_instrumenter'
+require_relative 'client/instrumented'
+require_relative 'client/named_requests'
 require_relative 'client/transport/future'
 require_relative 'client/transport/pending_requests'
 require_relative 'client/transport/stream_ids'
@@ -50,14 +57,19 @@ require_relative 'client/transport/frame_writer'
 require_relative 'client/transport/handshake'
 require_relative 'client/transport/connection'
 require_relative 'client/transport/link_state'
+require_relative 'client/transport/link_events'
 require_relative 'client/transport/link'
 require_relative 'client/index_info'
+require_relative 'client/tuple_mapping'
 require_relative 'client/space_info'
 require_relative 'client/schema'
 require_relative 'client/schema_cache'
 require_relative 'client/sql_result'
 require_relative 'client/prepared_statement'
+require_relative 'client/batch_delete'
 require_relative 'client/transaction_schema'
+require_relative 'client/row'
+require_relative 'client/tuple_shape'
 require_relative 'client/operations'
 require_relative 'client/transaction_scope'
 require_relative 'client/stream'
@@ -68,6 +80,7 @@ require_relative 'client/watchers/dispatcher'
 require_relative 'client/fork_safety'
 require_relative 'client/pool'
 require_relative 'client/pool/member_fork_safety'
+require_relative 'client/pool/member_role'
 require_relative 'client/pool/member'
 
 module Tarantool
@@ -75,6 +88,8 @@ module Tarantool
   class Client
     include Operations
     include ForkSafety
+    include Instrumented
+    include NamedRequests
 
     attr_reader :config
 
@@ -85,6 +100,7 @@ module Tarantool
 
     def initialize(uri = nil, **)
       @config = Configuration.build(uri, **)
+      @instrumentation = Instrumentation.build(@config)
       @pid = Process.pid
       @reinit_lock = Mutex.new
       open_link
@@ -107,7 +123,7 @@ module Tarantool
       TransactionScope.enter(self) do
         stream = Stream.new(
           connection: @link.connection, schema_cache: @schema_cache, id: @stream_ids.next,
-          request_timeout: @config.request_timeout
+          request_timeout: @config.request_timeout, instrumentation: @instrumentation
         )
         stream.transaction(isolation:, timeout:, &block)
       end
@@ -139,7 +155,7 @@ module Tarantool
 
     def link_hooks = { on_connect: method(:load_schema), on_ready: method(:resubscribe), on_lost: method(:lost) }
 
-    def perform(request, timeout: nil, schema_version: nil, on_push: nil)
+    def transmit(request, timeout: nil, schema_version: nil, on_push: nil)
       ensure_fork_safe
       @link.perform(request, timeout: timeout || @config.request_timeout, schema_version:, on_push:)
     end
@@ -164,53 +180,12 @@ module Tarantool
 
     # Name-resolved requests carry the schema version they were resolved against, so the
     # server rejects them (ER_WRONG_SCHEMA_VERSION) instead of running them on a stale id.
-    def perform_on_space(space, index, timeout: nil, &)
-      return perform(yield(space, index), timeout:) if space.is_a?(Integer) && index.is_a?(Integer)
+    # A request that needs the space format is resolved the same way even by ids, so the
+    # format and the version it carries come from one schema.
+    def transmit_on_space(space, index, timeout: nil, format: false, payload: nil, &)
+      return transmit(yield(space, index), timeout:) if !format && space.is_a?(Integer) && index.is_a?(Integer)
 
-      perform_by_name(space, index, timeout || @config.request_timeout, &)
-    end
-
-    # Every schema fetch and attempt draws on one deadline, so the whole call stays within timeout.
-    # Waiting for a connection first means the cache already holds its schema or a newer one.
-    def perform_by_name(space, index, timeout, &)
-      ensure_fork_safe
-      deadline = Transport::Deadline.after(timeout)
-      @link.connection(deadline)
-
-      perform_with_schema_check(space, index, deadline, &)
-    rescue TimeoutError
-      raise TimeoutError, "no response within #{timeout}s"
-    end
-
-    def lookup_space(space, timeout)
-      ensure_fork_safe
-      timeout ||= @config.request_timeout
-      deadline = Transport::Deadline.after(timeout)
-      @link.connection(deadline)
-
-      @schema_cache.space_info(space, deadline)
-    rescue TimeoutError
-      raise TimeoutError, "no response within #{timeout}s"
-    end
-
-    def perform_with_schema_check(space, index, deadline)
-      schema, ids = @schema_cache.resolve(space, index, deadline)
-
-      perform_resolved(schema, yield(*ids), deadline)
-    rescue ServerError => e
-      raise unless e.code == Protocol::Constants::ER_WRONG_SCHEMA_VERSION
-
-      fresh = @schema_cache.reload(schema, timeout: Transport::Deadline.remaining(deadline))
-      schema, ids = @schema_cache.resolve(space, index, deadline, fresh)
-      perform_resolved(schema, yield(*ids), deadline)
-    end
-
-    # Only the connection the schema came from: once it is lost, another instance may reuse the
-    # schema version with other ids, so the request fails with it rather than wait for a reconnect.
-    def perform_resolved(schema, request, deadline)
-      timeout = Transport::Deadline.remaining(deadline)
-
-      schema.connection.perform(request, timeout:, schema_version: schema.version)
+      perform_by_name(space, index, timeout || @config.request_timeout, payload, &)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tarantool-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Starlexxx
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-16 00:00:00.000000000 Z
+date: 2026-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -52,17 +52,26 @@ files:
 - README.md
 - lib/tarantool/client.rb
 - lib/tarantool/client/backoff.rb
+- lib/tarantool/client/batch_delete.rb
 - lib/tarantool/client/box_error.rb
 - lib/tarantool/client/callback_guard.rb
 - lib/tarantool/client/configuration.rb
+- lib/tarantool/client/diagnostics.rb
 - lib/tarantool/client/errors.rb
 - lib/tarantool/client/fork_safety.rb
 - lib/tarantool/client/index_info.rb
+- lib/tarantool/client/instrumentation.rb
+- lib/tarantool/client/instrumentation/log_instrumenter.rb
+- lib/tarantool/client/instrumentation/log_lines.rb
+- lib/tarantool/client/instrumentation/request_payload.rb
+- lib/tarantool/client/instrumented.rb
 - lib/tarantool/client/interval.rb
+- lib/tarantool/client/named_requests.rb
 - lib/tarantool/client/operations.rb
 - lib/tarantool/client/pool.rb
 - lib/tarantool/client/pool/member.rb
 - lib/tarantool/client/pool/member_fork_safety.rb
+- lib/tarantool/client/pool/member_role.rb
 - lib/tarantool/client/prepared_statement.rb
 - lib/tarantool/client/protocol/auth/chap_sha1.rb
 - lib/tarantool/client/protocol/codec.rb
@@ -93,6 +102,7 @@ files:
 - lib/tarantool/client/protocol/requests/upsert.rb
 - lib/tarantool/client/protocol/requests/watch.rb
 - lib/tarantool/client/protocol/response.rb
+- lib/tarantool/client/row.rb
 - lib/tarantool/client/schema.rb
 - lib/tarantool/client/schema_cache.rb
 - lib/tarantool/client/space_info.rb
@@ -107,11 +117,14 @@ files:
 - lib/tarantool/client/transport/future.rb
 - lib/tarantool/client/transport/handshake.rb
 - lib/tarantool/client/transport/link.rb
+- lib/tarantool/client/transport/link_events.rb
 - lib/tarantool/client/transport/link_state.rb
 - lib/tarantool/client/transport/pending_requests.rb
 - lib/tarantool/client/transport/stream_ids.rb
 - lib/tarantool/client/transport/timed_lock.rb
 - lib/tarantool/client/transport/timed_read.rb
+- lib/tarantool/client/tuple_mapping.rb
+- lib/tarantool/client/tuple_shape.rb
 - lib/tarantool/client/uuid.rb
 - lib/tarantool/client/version.rb
 - lib/tarantool/client/watcher.rb