lib/elasticsearch/api/actions/bulk.rb in elasticsearch-api-7.8.1 vs lib/elasticsearch/api/actions/bulk.rb in elasticsearch-api-7.9.0.pre

- old
+ new

@@ -23,21 +23,23 @@ # @option arguments [String] :index Default index for items which don't provide one # @option arguments [String] :type Default document type for items which don't provide one # @option arguments [String] :wait_for_active_shards Sets the number of shard copies that must be active before proceeding with the bulk operation. Defaults to 1, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1) # @option arguments [String] :refresh If `true` then refresh the affected shards to make this operation visible to search, if `wait_for` then wait for a refresh to make this operation visible to search, if `false` (the default) then do nothing with refreshes. # (options: true,false,wait_for) + # @option arguments [String] :routing Specific routing value # @option arguments [Time] :timeout Explicit operation timeout # @option arguments [String] :type Default document type for items which don't provide one # @option arguments [List] :_source True or false to return the _source field or not, or default list of fields to return, can be overridden on each sub-request # @option arguments [List] :_source_excludes Default list of fields to exclude from the returned _source field, can be overridden on each sub-request # @option arguments [List] :_source_includes Default list of fields to extract and return from the _source field, can be overridden on each sub-request # @option arguments [String] :pipeline The pipeline id to preprocess incoming documents with # @option arguments [Hash] :headers Custom HTTP headers - # @option arguments [Hash] :body The operation definition and data (action-data pairs), separated by newlines (*Required*) + # @option arguments [String|Array] :body The operation definition and data (action-data pairs), separated by newlines. Array of Strings, Header/Data pairs, + # or the conveniency "combined" format can be passed, refer to Elasticsearch::API::Utils.__bulkify documentation. # - # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.8/docs-bulk.html + # @see https://www.elastic.co/guide/en/elasticsearch/reference/7.x/docs-bulk.html # def bulk(arguments = {}) raise ArgumentError, "Required argument 'body' missing" unless arguments[:body] headers = arguments.delete(:headers) || {} @@ -53,19 +55,19 @@ "#{Utils.__listify(_index)}/#{Utils.__listify(_type)}/_bulk" elsif _index "#{Utils.__listify(_index)}/_bulk" else "_bulk" - end + end params = Utils.__validate_and_extract_params arguments, ParamsRegistry.get(__method__) body = arguments[:body] if body.is_a? Array payload = Elasticsearch::API::Utils.__bulkify(body) else payload = body - end + end headers.merge!("Content-Type" => "application/x-ndjson") perform_request(method, path, params, payload, headers).body end @@ -82,7 +84,7 @@ :_source_excludes, :_source_includes, :pipeline ].freeze) end - end + end end