{"action":"created","comment":{"url":"https://api.github.com/repos/VoltDB/voltdb/pulls/comments/42914521","id":42914521,"diff_hunk":"@@ -127,9 +148,29 @@ int64_t BinaryLogSink::apply(const char *taskParams, boost::unordered_map<int64_\n \n             TableTuple deleteTuple = table->lookupTupleByValues(tempTuple);\n             if (deleteTuple.isNullTuple()) {\n+                if (isActiveActiveDREnabled && table->isDREnabled()) {\n+                    if (handleConflict(engine, table, pool, NULL, &tempTuple, NULL, uniqueId, DR_RECORD_DELETE, CONFLICT_EXPECTED_ROW_MISSING, NO_CONFLICT)) {\n+                        continue;\n+                    }\n+                }\n                 throwSerializableEEException(\"Unable to find tuple for deletion: binary log type (%d), DR ID (%jd), unique ID (%jd), tuple %s\\n\",\n-                                             type, (intmax_t)sequenceNumber, (intmax_t)uniqueId, tempTuple.debug(table->name()).c_str());\n+                                                 type, (intmax_t)sequenceNumber, (intmax_t)uniqueId, tempTuple.debug(table->name()).c_str());\n+            }\n+\n+            // we still run in risk of having timestamp mismatch, need to check.\n+            if (isActiveActiveDREnabled && table->isDREnabled()) {","path":"src/ee/storage/BinaryLogSink.cpp","position":77,"original_position":77,"commit_id":"cbc7230695c6431f3d5d57bf36bbe8ece50a5b68","original_commit_id":"cbc7230695c6431f3d5d57bf36bbe8ece50a5b68","user":{"login":"nshi","id":10992,"avatar_url":"https://avatars.githubusercontent.com/u/10992?v=3","gravatar_id":"","url":"https://api.github.com/users/nshi","html_url":"https://github.com/nshi","followers_url":"https://api.github.com/users/nshi/followers","following_url":"https://api.github.com/users/nshi/following{/other_user}","gists_url":"https://api.github.com/users/nshi/gists{/gist_id}","starred_url":"https://api.github.com/users/nshi/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nshi/subscriptions","organizations_url":"https://api.github.com/users/nshi/orgs","repos_url":"https://api.github.com/users/nshi/repos","events_url":"https://api.github.com/users/nshi/events{/privacy}","received_events_url":"https://api.github.com/users/nshi/received_events","type":"User","site_admin":false},"body":"And here.","created_at":"2015-10-23T21:08:14Z","updated_at":"2015-10-23T21:08:14Z","html_url":"https://github.com/VoltDB/voltdb/pull/2919#discussion_r42914521","pull_request_url":"https://api.github.com/repos/VoltDB/voltdb/pulls/2919","_links":{"self":{"href":"https://api.github.com/repos/VoltDB/voltdb/pulls/comments/42914521"},"html":{"href":"https://github.com/VoltDB/voltdb/pull/2919#discussion_r42914521"},"pull_request":{"href":"https://api.github.com/repos/VoltDB/voltdb/pulls/2919"}}},"pull_request":{"url":"https://api.github.com/repos/VoltDB/voltdb/pulls/2919","id":48518087,"html_url":"https://github.com/VoltDB/voltdb/pull/2919","diff_url":"https://github.com/VoltDB/voltdb/pull/2919.diff","patch_url":"https://github.com/VoltDB/voltdb/pull/2919.patch","issue_url":"https://api.github.com/repos/VoltDB/voltdb/issues/2919","number":2919,"state":"open","locked":false,"title":"Eng 8842 rebased","user":{"login":"afrogers","id":4966215,"avatar_url":"https://avatars.githubusercontent.com/u/4966215?v=3","gravatar_id":"","url":"https://api.github.com/users/afrogers","html_url":"https://github.com/afrogers","followers_url":"https://api.github.com/users/afrogers/followers","following_url":"https://api.github.com/users/afrogers/following{/other_user}","gists_url":"https://api.github.com/users/afrogers/gists{/gist_id}","starred_url":"https://api.github.com/users/afrogers/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/afrogers/subscriptions","organizations_url":"https://api.github.com/users/afrogers/orgs","repos_url":"https://api.github.com/users/afrogers/repos","events_url":"https://api.github.com/users/afrogers/events{/privacy}","received_events_url":"https://api.github.com/users/afrogers/received_events","type":"User","site_admin":false},"body":"","created_at":"2015-10-22T21:51:41Z","updated_at":"2015-10-23T21:08:14Z","closed_at":null,"merged_at":null,"merge_commit_sha":"40a96243e58e9236844dd168d590b3d06af6187f","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/VoltDB/voltdb/pulls/2919/commits","review_comments_url":"https://api.github.com/repos/VoltDB/voltdb/pulls/2919/comments","review_comment_url":"https://api.github.com/repos/VoltDB/voltdb/pulls/comments{/number}","comments_url":"https://api.github.com/repos/VoltDB/voltdb/issues/2919/comments","statuses_url":"https://api.github.com/repos/VoltDB/voltdb/statuses/cbc7230695c6431f3d5d57bf36bbe8ece50a5b68","head":{"label":"VoltDB:ENG-8842-rebased","ref":"ENG-8842-rebased","sha":"cbc7230695c6431f3d5d57bf36bbe8ece50a5b68","user":{"login":"VoltDB","id":703910,"avatar_url":"https://avatars.githubusercontent.com/u/703910?v=3","gravatar_id":"","url":"https://api.github.com/users/VoltDB","html_url":"https://github.com/VoltDB","followers_url":"https://api.github.com/users/VoltDB/followers","following_url":"https://api.github.com/users/VoltDB/following{/other_user}","gists_url":"https://api.github.com/users/VoltDB/gists{/gist_id}","starred_url":"https://api.github.com/users/VoltDB/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/VoltDB/subscriptions","organizations_url":"https://api.github.com/users/VoltDB/orgs","repos_url":"https://api.github.com/users/VoltDB/repos","events_url":"https://api.github.com/users/VoltDB/events{/privacy}","received_events_url":"https://api.github.com/users/VoltDB/received_events","type":"Organization","site_admin":false},"repo":{"id":2445970,"name":"voltdb","full_name":"VoltDB/voltdb","owner":{"login":"VoltDB","id":703910,"avatar_url":"https://avatars.githubusercontent.com/u/703910?v=3","gravatar_id":"","url":"https://api.github.com/users/VoltDB","html_url":"https://github.com/VoltDB","followers_url":"https://api.github.com/users/VoltDB/followers","following_url":"https://api.github.com/users/VoltDB/following{/other_user}","gists_url":"https://api.github.com/users/VoltDB/gists{/gist_id}","starred_url":"https://api.github.com/users/VoltDB/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/VoltDB/subscriptions","organizations_url":"https://api.github.com/users/VoltDB/orgs","repos_url":"https://api.github.com/users/VoltDB/repos","events_url":"https://api.github.com/users/VoltDB/events{/privacy}","received_events_url":"https://api.github.com/users/VoltDB/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/VoltDB/voltdb","description":"VoltDB","fork":false,"url":"https://api.github.com/repos/VoltDB/voltdb","forks_url":"https://api.github.com/repos/VoltDB/voltdb/forks","keys_url":"https://api.github.com/repos/VoltDB/voltdb/keys{/key_id}","collaborators_url":"https://api.github.com/repos/VoltDB/voltdb/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/VoltDB/voltdb/teams","hooks_url":"https://api.github.com/repos/VoltDB/voltdb/hooks","issue_events_url":"https://api.github.com/repos/VoltDB/voltdb/issues/events{/number}","events_url":"https://api.github.com/repos/VoltDB/voltdb/events","assignees_url":"https://api.github.com/repos/VoltDB/voltdb/assignees{/user}","branches_url":"https://api.github.com/repos/VoltDB/voltdb/branches{/branch}","tags_url":"https://api.github.com/repos/VoltDB/voltdb/tags","blobs_url":"https://api.github.com/repos/VoltDB/voltdb/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/VoltDB/voltdb/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/VoltDB/voltdb/git/refs{/sha}","trees_url":"https://api.github.com/repos/VoltDB/voltdb/git/trees{/sha}","statuses_url":"https://api.github.com/repos/VoltDB/voltdb/statuses/{sha}","languages_url":"https://api.github.com/repos/VoltDB/voltdb/languages","stargazers_url":"https://api.github.com/repos/VoltDB/voltdb/stargazers","contributors_url":"https://api.github.com/repos/VoltDB/voltdb/contributors","subscribers_url":"https://api.github.com/repos/VoltDB/voltdb/subscribers","subscription_url":"https://api.github.com/repos/VoltDB/voltdb/subscription","commits_url":"https://api.github.com/repos/VoltDB/voltdb/commits{/sha}","git_commits_url":"https://api.github.com/repos/VoltDB/voltdb/git/commits{/sha}","comments_url":"https://api.github.com/repos/VoltDB/voltdb/comments{/number}","issue_comment_url":"https://api.github.com/repos/VoltDB/voltdb/issues/comments{/number}","contents_url":"https://api.github.com/repos/VoltDB/voltdb/contents/{+path}","compare_url":"https://api.github.com/repos/VoltDB/voltdb/compare/{base}...{head}","merges_url":"https://api.github.com/repos/VoltDB/voltdb/merges","archive_url":"https://api.github.com/repos/VoltDB/voltdb/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/VoltDB/voltdb/downloads","issues_url":"https://api.github.com/repos/VoltDB/voltdb/issues{/number}","pulls_url":"https://api.github.com/repos/VoltDB/voltdb/pulls{/number}","milestones_url":"https://api.github.com/repos/VoltDB/voltdb/milestones{/number}","notifications_url":"https://api.github.com/repos/VoltDB/voltdb/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/VoltDB/voltdb/labels{/name}","releases_url":"https://api.github.com/repos/VoltDB/voltdb/releases{/id}","created_at":"2011-09-23T18:46:12Z","updated_at":"2015-10-23T14:53:32Z","pushed_at":"2015-10-23T21:01:50Z","git_url":"git://github.com/VoltDB/voltdb.git","ssh_url":"git@github.com:VoltDB/voltdb.git","clone_url":"https://github.com/VoltDB/voltdb.git","svn_url":"https://github.com/VoltDB/voltdb","homepage":"http://community.voltdb.com/","size":956649,"stargazers_count":651,"watchers_count":651,"language":"Java","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":191,"mirror_url":null,"open_issues_count":32,"forks":191,"open_issues":32,"watchers":651,"default_branch":"master"}},"base":{"label":"VoltDB:master","ref":"master","sha":"34514a79db00e93b8fda15747731405b160f5ec6","user":{"login":"VoltDB","id":703910,"avatar_url":"https://avatars.githubusercontent.com/u/703910?v=3","gravatar_id":"","url":"https://api.github.com/users/VoltDB","html_url":"https://github.com/VoltDB","followers_url":"https://api.github.com/users/VoltDB/followers","following_url":"https://api.github.com/users/VoltDB/following{/other_user}","gists_url":"https://api.github.com/users/VoltDB/gists{/gist_id}","starred_url":"https://api.github.com/users/VoltDB/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/VoltDB/subscriptions","organizations_url":"https://api.github.com/users/VoltDB/orgs","repos_url":"https://api.github.com/users/VoltDB/repos","events_url":"https://api.github.com/users/VoltDB/events{/privacy}","received_events_url":"https://api.github.com/users/VoltDB/received_events","type":"Organization","site_admin":false},"repo":{"id":2445970,"name":"voltdb","full_name":"VoltDB/voltdb","owner":{"login":"VoltDB","id":703910,"avatar_url":"https://avatars.githubusercontent.com/u/703910?v=3","gravatar_id":"","url":"https://api.github.com/users/VoltDB","html_url":"https://github.com/VoltDB","followers_url":"https://api.github.com/users/VoltDB/followers","following_url":"https://api.github.com/users/VoltDB/following{/other_user}","gists_url":"https://api.github.com/users/VoltDB/gists{/gist_id}","starred_url":"https://api.github.com/users/VoltDB/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/VoltDB/subscriptions","organizations_url":"https://api.github.com/users/VoltDB/orgs","repos_url":"https://api.github.com/users/VoltDB/repos","events_url":"https://api.github.com/users/VoltDB/events{/privacy}","received_events_url":"https://api.github.com/users/VoltDB/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/VoltDB/voltdb","description":"VoltDB","fork":false,"url":"https://api.github.com/repos/VoltDB/voltdb","forks_url":"https://api.github.com/repos/VoltDB/voltdb/forks","keys_url":"https://api.github.com/repos/VoltDB/voltdb/keys{/key_id}","collaborators_url":"https://api.github.com/repos/VoltDB/voltdb/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/VoltDB/voltdb/teams","hooks_url":"https://api.github.com/repos/VoltDB/voltdb/hooks","issue_events_url":"https://api.github.com/repos/VoltDB/voltdb/issues/events{/number}","events_url":"https://api.github.com/repos/VoltDB/voltdb/events","assignees_url":"https://api.github.com/repos/VoltDB/voltdb/assignees{/user}","branches_url":"https://api.github.com/repos/VoltDB/voltdb/branches{/branch}","tags_url":"https://api.github.com/repos/VoltDB/voltdb/tags","blobs_url":"https://api.github.com/repos/VoltDB/voltdb/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/VoltDB/voltdb/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/VoltDB/voltdb/git/refs{/sha}","trees_url":"https://api.github.com/repos/VoltDB/voltdb/git/trees{/sha}","statuses_url":"https://api.github.com/repos/VoltDB/voltdb/statuses/{sha}","languages_url":"https://api.github.com/repos/VoltDB/voltdb/languages","stargazers_url":"https://api.github.com/repos/VoltDB/voltdb/stargazers","contributors_url":"https://api.github.com/repos/VoltDB/voltdb/contributors","subscribers_url":"https://api.github.com/repos/VoltDB/voltdb/subscribers","subscription_url":"https://api.github.com/repos/VoltDB/voltdb/subscription","commits_url":"https://api.github.com/repos/VoltDB/voltdb/commits{/sha}","git_commits_url":"https://api.github.com/repos/VoltDB/voltdb/git/commits{/sha}","comments_url":"https://api.github.com/repos/VoltDB/voltdb/comments{/number}","issue_comment_url":"https://api.github.com/repos/VoltDB/voltdb/issues/comments{/number}","contents_url":"https://api.github.com/repos/VoltDB/voltdb/contents/{+path}","compare_url":"https://api.github.com/repos/VoltDB/voltdb/compare/{base}...{head}","merges_url":"https://api.github.com/repos/VoltDB/voltdb/merges","archive_url":"https://api.github.com/repos/VoltDB/voltdb/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/VoltDB/voltdb/downloads","issues_url":"https://api.github.com/repos/VoltDB/voltdb/issues{/number}","pulls_url":"https://api.github.com/repos/VoltDB/voltdb/pulls{/number}","milestones_url":"https://api.github.com/repos/VoltDB/voltdb/milestones{/number}","notifications_url":"https://api.github.com/repos/VoltDB/voltdb/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/VoltDB/voltdb/labels{/name}","releases_url":"https://api.github.com/repos/VoltDB/voltdb/releases{/id}","created_at":"2011-09-23T18:46:12Z","updated_at":"2015-10-23T14:53:32Z","pushed_at":"2015-10-23T21:01:50Z","git_url":"git://github.com/VoltDB/voltdb.git","ssh_url":"git@github.com:VoltDB/voltdb.git","clone_url":"https://github.com/VoltDB/voltdb.git","svn_url":"https://github.com/VoltDB/voltdb","homepage":"http://community.voltdb.com/","size":956649,"stargazers_count":651,"watchers_count":651,"language":"Java","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":191,"mirror_url":null,"open_issues_count":32,"forks":191,"open_issues":32,"watchers":651,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/VoltDB/voltdb/pulls/2919"},"html":{"href":"https://github.com/VoltDB/voltdb/pull/2919"},"issue":{"href":"https://api.github.com/repos/VoltDB/voltdb/issues/2919"},"comments":{"href":"https://api.github.com/repos/VoltDB/voltdb/issues/2919/comments"},"review_comments":{"href":"https://api.github.com/repos/VoltDB/voltdb/pulls/2919/comments"},"review_comment":{"href":"https://api.github.com/repos/VoltDB/voltdb/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/VoltDB/voltdb/pulls/2919/commits"},"statuses":{"href":"https://api.github.com/repos/VoltDB/voltdb/statuses/cbc7230695c6431f3d5d57bf36bbe8ece50a5b68"}}}}