Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add an ability to customize bulk api url #106

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
10 changes: 7 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,11 @@ config :my_app, MyApp.ElasticsearchCluster,

# By default bulk indexing uses the "create" action. To allow existing
# documents to be replaced, use the "index" action instead.
bulk_action: "create"
bulk_action: "create",

# Path to bulk api url. Should start with a slash.
# You may need to use `/_doc/_bulk` for older ElasticSearch versions.
bulk_path: "/_bulk"
}
}
```
Expand Down Expand Up @@ -207,9 +211,9 @@ As AWS does not provide credentials' based http authentication, you can use the
To use this, just add `sigaws` to your dependencies and add this to your configuration:

```elixir
# Add to deps
# Add to deps
def deps do
[
[
# ...
{:sigaws, ">= 0.0.0"}
]
Expand Down
10 changes: 6 additions & 4 deletions lib/elasticsearch/indexing/bulk.ex
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ defmodule Elasticsearch.Index.Bulk do
bulk_page_size = index_config[:bulk_page_size] || 5000
bulk_wait_interval = index_config[:bulk_wait_interval] || 0
action = index_config[:bulk_action] || "create"
bulk_path = index_config[:bulk_path] || "/_bulk"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ssbb This is technically a breaking change for anyone who is currently using an old version of Elasticsearch. I would prefer to make the default "/_doc/_bulk" here until I'm ready to release v2.0.0.

Suggested change
bulk_path = index_config[:bulk_path] || "/_bulk"
bulk_path = index_config[:bulk_path] || "/_doc/_bulk"

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@danielberkompas Done! I just misread README about compatibility with older versions.


errors =
store.transaction(fn ->
Expand All @@ -108,20 +109,21 @@ defmodule Elasticsearch.Index.Bulk do
|> Stream.map(&encode!(config, &1, index_name, action))
|> Stream.chunk_every(bulk_page_size)
|> Stream.intersperse(bulk_wait_interval)
|> Stream.map(&put_bulk_page(config, index_name, &1))
|> Stream.map(&put_bulk_page(config, index_name, bulk_path, &1))
|> Enum.reduce(errors, &collect_errors(&1, &2, action))
end)

upload(config, index_name, %{index_config | sources: tail}, errors)
end

defp put_bulk_page(_config, _index_name, wait_interval) when is_integer(wait_interval) do
defp put_bulk_page(_config, _index_name, _bulk_path, wait_interval)
when is_integer(wait_interval) do
Logger.debug("Pausing #{wait_interval}ms between bulk pages")
:timer.sleep(wait_interval)
end

defp put_bulk_page(config, index_name, items) when is_list(items) do
Elasticsearch.put(config, "/#{index_name}/_doc/_bulk", Enum.join(items))
defp put_bulk_page(config, index_name, bulk_path, items) when is_list(items) do
Elasticsearch.put(config, "/#{index_name}#{bulk_path}", Enum.join(items))
end

defp collect_errors({:ok, %{"errors" => true} = response}, errors, action) do
Expand Down