{"action":"created","comment":{"url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/pulls/comments/80890245","pull_request_review_id":1910600,"id":80890245,"diff_hunk":"@@ -1,81 +1,42 @@\n [[version-control]]\n-=== Dealing with Conflicts\n+=== 处理冲突\n \n-When updating a document with (((\"conflicts\", \"dealing with\")))the `index` API, we read the original document,\n-make our changes, and then reindex the _whole document_ in one go. The most recent\n-indexing request wins: whichever document was indexed last is the one stored\n-in Elasticsearch. If somebody else had changed the document in the meantime,\n-their changes would be lost.\n+当使用 `index` API 更新文档 (((\"conflicts\", \"dealing with\")))，我们读到原始文件，更改它，然后重新索引整个文档。 最近的索引请求将胜出：哪一个文档最后被索引就会存储在 Elasticsearch 中。如果其他人同时更改这个文档，他们的更改将丢失。\n \n-Many times, this is not a problem.  Perhaps our main data store is a\n-relational database, and we just copy the data into Elasticsearch to make it\n-searchable. Perhaps there is little chance of two people changing the same\n-document at the same time. Or perhaps it doesn't really matter to our business\n-if we lose changes occasionally.\n+许多时候这是没有问题的。或许我们的主数据存储是一个关系型数据库，我们只需要将数据复制到 Elasticsearch 中并使其可搜索。或许两个人同时更改相同的文档的几率很小。或许对于我们的业务来说偶尔丢失的更改并不是很严重的问题。","path":"030_Data/40_Version_control.asciidoc","position":17,"original_position":17,"commit_id":"3c2a904affde223a2a4aec364dcf81996356363a","original_commit_id":"3c2a904affde223a2a4aec364dcf81996356363a","user":{"login":"xuej","id":6321798,"avatar_url":"https://avatars.githubusercontent.com/u/6321798?v=3","gravatar_id":"","url":"https://api.github.com/users/xuej","html_url":"https://github.com/xuej","followers_url":"https://api.github.com/users/xuej/followers","following_url":"https://api.github.com/users/xuej/following{/other_user}","gists_url":"https://api.github.com/users/xuej/gists{/gist_id}","starred_url":"https://api.github.com/users/xuej/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/xuej/subscriptions","organizations_url":"https://api.github.com/users/xuej/orgs","repos_url":"https://api.github.com/users/xuej/repos","events_url":"https://api.github.com/users/xuej/events{/privacy}","received_events_url":"https://api.github.com/users/xuej/received_events","type":"User","site_admin":false},"body":"我们只需要将数据复制=》我们只是将数据复制？\r\n偶尔丢失的更改=？偶尔丢失更改？","created_at":"2016-09-28T10:55:27Z","updated_at":"2016-09-28T10:55:27Z","html_url":"https://github.com/elasticsearch-cn/elasticsearch-definitive-guide/pull/233#discussion_r80890245","pull_request_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/pulls/233","_links":{"self":{"href":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/pulls/comments/80890245"},"html":{"href":"https://github.com/elasticsearch-cn/elasticsearch-definitive-guide/pull/233#discussion_r80890245"},"pull_request":{"href":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/pulls/233"}}},"pull_request":{"url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/pulls/233","id":83093867,"html_url":"https://github.com/elasticsearch-cn/elasticsearch-definitive-guide/pull/233","diff_url":"https://github.com/elasticsearch-cn/elasticsearch-definitive-guide/pull/233.diff","patch_url":"https://github.com/elasticsearch-cn/elasticsearch-definitive-guide/pull/233.patch","issue_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/issues/233","number":233,"state":"open","locked":false,"title":"chapter3:/030_Data/40_Version_control.asciidoc","user":{"login":"wharstr9027","id":15881226,"avatar_url":"https://avatars.githubusercontent.com/u/15881226?v=3","gravatar_id":"","url":"https://api.github.com/users/wharstr9027","html_url":"https://github.com/wharstr9027","followers_url":"https://api.github.com/users/wharstr9027/followers","following_url":"https://api.github.com/users/wharstr9027/following{/other_user}","gists_url":"https://api.github.com/users/wharstr9027/gists{/gist_id}","starred_url":"https://api.github.com/users/wharstr9027/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wharstr9027/subscriptions","organizations_url":"https://api.github.com/users/wharstr9027/orgs","repos_url":"https://api.github.com/users/wharstr9027/repos","events_url":"https://api.github.com/users/wharstr9027/events{/privacy}","received_events_url":"https://api.github.com/users/wharstr9027/received_events","type":"User","site_admin":false},"body":"<!--\r\nThanks for the Pull Request!  We really appreciate your help and contribution!\r\n\r\nBefore you submit the PR, have you signed Contributor License Agreement: https://www.elastic.co/contributor-agreement/ ?\r\n\r\nPR's (no matter how small) cannot be merged until the CLA has been signed.  \r\nIt only needs to be signed once, however. Thanks!\r\n-->\r\n\r\n","created_at":"2016-08-29T12:52:55Z","updated_at":"2016-09-28T10:55:27Z","closed_at":null,"merged_at":null,"merge_commit_sha":"2984843f057e1dc47b24310ca9ba0f611d5b73b9","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/pulls/233/commits","review_comments_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/pulls/233/comments","review_comment_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/pulls/comments{/number}","comments_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/issues/233/comments","statuses_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/statuses/3c2a904affde223a2a4aec364dcf81996356363a","head":{"label":"wharstr9027:chapter/40_version","ref":"chapter/40_version","sha":"3c2a904affde223a2a4aec364dcf81996356363a","user":{"login":"wharstr9027","id":15881226,"avatar_url":"https://avatars.githubusercontent.com/u/15881226?v=3","gravatar_id":"","url":"https://api.github.com/users/wharstr9027","html_url":"https://github.com/wharstr9027","followers_url":"https://api.github.com/users/wharstr9027/followers","following_url":"https://api.github.com/users/wharstr9027/following{/other_user}","gists_url":"https://api.github.com/users/wharstr9027/gists{/gist_id}","starred_url":"https://api.github.com/users/wharstr9027/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wharstr9027/subscriptions","organizations_url":"https://api.github.com/users/wharstr9027/orgs","repos_url":"https://api.github.com/users/wharstr9027/repos","events_url":"https://api.github.com/users/wharstr9027/events{/privacy}","received_events_url":"https://api.github.com/users/wharstr9027/received_events","type":"User","site_admin":false},"repo":{"id":66627048,"name":"elasticsearch-definitive-guide","full_name":"wharstr9027/elasticsearch-definitive-guide","owner":{"login":"wharstr9027","id":15881226,"avatar_url":"https://avatars.githubusercontent.com/u/15881226?v=3","gravatar_id":"","url":"https://api.github.com/users/wharstr9027","html_url":"https://github.com/wharstr9027","followers_url":"https://api.github.com/users/wharstr9027/followers","following_url":"https://api.github.com/users/wharstr9027/following{/other_user}","gists_url":"https://api.github.com/users/wharstr9027/gists{/gist_id}","starred_url":"https://api.github.com/users/wharstr9027/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wharstr9027/subscriptions","organizations_url":"https://api.github.com/users/wharstr9027/orgs","repos_url":"https://api.github.com/users/wharstr9027/repos","events_url":"https://api.github.com/users/wharstr9027/events{/privacy}","received_events_url":"https://api.github.com/users/wharstr9027/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/wharstr9027/elasticsearch-definitive-guide","description":"欢迎加QQ群：109764489，贡献力量！","fork":true,"url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide","forks_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/forks","keys_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/keys{/key_id}","collaborators_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/teams","hooks_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/hooks","issue_events_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/issues/events{/number}","events_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/events","assignees_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/assignees{/user}","branches_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/branches{/branch}","tags_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/tags","blobs_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/git/refs{/sha}","trees_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/git/trees{/sha}","statuses_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/statuses/{sha}","languages_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/languages","stargazers_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/stargazers","contributors_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/contributors","subscribers_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/subscribers","subscription_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/subscription","commits_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/commits{/sha}","git_commits_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/git/commits{/sha}","comments_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/comments{/number}","issue_comment_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/issues/comments{/number}","contents_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/contents/{+path}","compare_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/compare/{base}...{head}","merges_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/merges","archive_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/downloads","issues_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/issues{/number}","pulls_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/pulls{/number}","milestones_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/milestones{/number}","notifications_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/labels{/name}","releases_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/releases{/id}","deployments_url":"https://api.github.com/repos/wharstr9027/elasticsearch-definitive-guide/deployments","created_at":"2016-08-26T07:35:35Z","updated_at":"2016-08-26T07:35:37Z","pushed_at":"2016-08-29T12:48:09Z","git_url":"git://github.com/wharstr9027/elasticsearch-definitive-guide.git","ssh_url":"git@github.com:wharstr9027/elasticsearch-definitive-guide.git","clone_url":"https://github.com/wharstr9027/elasticsearch-definitive-guide.git","svn_url":"https://github.com/wharstr9027/elasticsearch-definitive-guide","homepage":"","size":8135,"stargazers_count":0,"watchers_count":0,"language":"HTML","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"cn"}},"base":{"label":"elasticsearch-cn:cn","ref":"cn","sha":"c283d6758af22dfe5db416012d9a2d4330daaf0d","user":{"login":"elasticsearch-cn","id":2517572,"avatar_url":"https://avatars.githubusercontent.com/u/2517572?v=3","gravatar_id":"","url":"https://api.github.com/users/elasticsearch-cn","html_url":"https://github.com/elasticsearch-cn","followers_url":"https://api.github.com/users/elasticsearch-cn/followers","following_url":"https://api.github.com/users/elasticsearch-cn/following{/other_user}","gists_url":"https://api.github.com/users/elasticsearch-cn/gists{/gist_id}","starred_url":"https://api.github.com/users/elasticsearch-cn/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/elasticsearch-cn/subscriptions","organizations_url":"https://api.github.com/users/elasticsearch-cn/orgs","repos_url":"https://api.github.com/users/elasticsearch-cn/repos","events_url":"https://api.github.com/users/elasticsearch-cn/events{/privacy}","received_events_url":"https://api.github.com/users/elasticsearch-cn/received_events","type":"Organization","site_admin":false},"repo":{"id":20916742,"name":"elasticsearch-definitive-guide","full_name":"elasticsearch-cn/elasticsearch-definitive-guide","owner":{"login":"elasticsearch-cn","id":2517572,"avatar_url":"https://avatars.githubusercontent.com/u/2517572?v=3","gravatar_id":"","url":"https://api.github.com/users/elasticsearch-cn","html_url":"https://github.com/elasticsearch-cn","followers_url":"https://api.github.com/users/elasticsearch-cn/followers","following_url":"https://api.github.com/users/elasticsearch-cn/following{/other_user}","gists_url":"https://api.github.com/users/elasticsearch-cn/gists{/gist_id}","starred_url":"https://api.github.com/users/elasticsearch-cn/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/elasticsearch-cn/subscriptions","organizations_url":"https://api.github.com/users/elasticsearch-cn/orgs","repos_url":"https://api.github.com/users/elasticsearch-cn/repos","events_url":"https://api.github.com/users/elasticsearch-cn/events{/privacy}","received_events_url":"https://api.github.com/users/elasticsearch-cn/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/elasticsearch-cn/elasticsearch-definitive-guide","description":"欢迎加QQ群：109764489，贡献力量！","fork":true,"url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide","forks_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/forks","keys_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/keys{/key_id}","collaborators_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/teams","hooks_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/hooks","issue_events_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/issues/events{/number}","events_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/events","assignees_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/assignees{/user}","branches_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/branches{/branch}","tags_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/tags","blobs_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/git/refs{/sha}","trees_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/git/trees{/sha}","statuses_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/statuses/{sha}","languages_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/languages","stargazers_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/stargazers","contributors_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/contributors","subscribers_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/subscribers","subscription_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/subscription","commits_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/commits{/sha}","git_commits_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/git/commits{/sha}","comments_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/comments{/number}","issue_comment_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/issues/comments{/number}","contents_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/contents/{+path}","compare_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/compare/{base}...{head}","merges_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/merges","archive_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/downloads","issues_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/issues{/number}","pulls_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/pulls{/number}","milestones_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/milestones{/number}","notifications_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/labels{/name}","releases_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/releases{/id}","deployments_url":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/deployments","created_at":"2014-06-17T08:56:29Z","updated_at":"2016-09-24T04:51:06Z","pushed_at":"2016-09-28T06:54:40Z","git_url":"git://github.com/elasticsearch-cn/elasticsearch-definitive-guide.git","ssh_url":"git@github.com:elasticsearch-cn/elasticsearch-definitive-guide.git","clone_url":"https://github.com/elasticsearch-cn/elasticsearch-definitive-guide.git","svn_url":"https://github.com/elasticsearch-cn/elasticsearch-definitive-guide","homepage":"","size":8952,"stargazers_count":76,"watchers_count":76,"language":"HTML","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":82,"mirror_url":null,"open_issues_count":245,"forks":82,"open_issues":245,"watchers":76,"default_branch":"cn"}},"_links":{"self":{"href":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/pulls/233"},"html":{"href":"https://github.com/elasticsearch-cn/elasticsearch-definitive-guide/pull/233"},"issue":{"href":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/issues/233"},"comments":{"href":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/issues/233/comments"},"review_comments":{"href":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/pulls/233/comments"},"review_comment":{"href":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/pulls/233/commits"},"statuses":{"href":"https://api.github.com/repos/elasticsearch-cn/elasticsearch-definitive-guide/statuses/3c2a904affde223a2a4aec364dcf81996356363a"}}}}
{"actor":{"display_login":"xuej"}}