{"action":"created","comment":{"url":"https://api.github.com/repos/mapsme/omim/pulls/comments/48414026","id":48414026,"diff_hunk":"@@ -214,6 +222,103 @@ UNIT_TEST(CompressedBitVector_Subtract4)\n   CheckSubtraction(setBits1, setBits2, *cbv3);\n }\n \n+UNIT_TEST(CompressedBitVector_Union_Smoke)\n+{\n+  vector<uint64_t> setBits1 = {};\n+  vector<uint64_t> setBits2 = {};\n+\n+  auto cbv1 = coding::CompressedBitVectorBuilder::FromBitPositions(setBits1);\n+  auto cbv2 = coding::CompressedBitVectorBuilder::FromBitPositions(setBits2);\n+  TEST(cbv1.get(), ());\n+  TEST(cbv2.get(), ());\n+  TEST_EQUAL(coding::CompressedBitVector::StorageStrategy::Sparse, cbv1->GetStorageStrategy(), ());\n+  TEST_EQUAL(coding::CompressedBitVector::StorageStrategy::Sparse, cbv2->GetStorageStrategy(), ());\n+\n+  auto cbv3 = coding::CompressedBitVector::Union(*cbv1, *cbv2);\n+  TEST(cbv3.get(), ());\n+  TEST_EQUAL(coding::CompressedBitVector::StorageStrategy::Sparse, cbv3->GetStorageStrategy(), ());\n+  CheckUnion(setBits1, setBits2, *cbv3);\n+}\n+\n+UNIT_TEST(CompressedBitVector_Union1)\n+{\n+  vector<uint64_t> setBits1 = {};\n+  vector<uint64_t> setBits2 = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};\n+\n+  auto cbv1 = coding::CompressedBitVectorBuilder::FromBitPositions(setBits1);\n+  auto cbv2 = coding::CompressedBitVectorBuilder::FromBitPositions(setBits2);\n+  TEST(cbv1.get(), ());\n+  TEST(cbv2.get(), ());\n+  TEST_EQUAL(coding::CompressedBitVector::StorageStrategy::Sparse, cbv1->GetStorageStrategy(), ());\n+  TEST_EQUAL(coding::CompressedBitVector::StorageStrategy::Dense, cbv2->GetStorageStrategy(), ());\n+\n+  auto cbv3 = coding::CompressedBitVector::Union(*cbv1, *cbv2);\n+  TEST(cbv3.get(), ());\n+  TEST_EQUAL(coding::CompressedBitVector::StorageStrategy::Dense, cbv3->GetStorageStrategy(), ());\n+  CheckUnion(setBits1, setBits2, *cbv3);\n+}\n+\n+UNIT_TEST(CompressedBitVector_Union2)\n+{\n+  vector<uint64_t> setBits1 = {256, 1024};\n+  vector<uint64_t> setBits2 = {0, 32, 64};\n+\n+  auto cbv1 = coding::CompressedBitVectorBuilder::FromBitPositions(setBits1);\n+  auto cbv2 = coding::CompressedBitVectorBuilder::FromBitPositions(setBits2);\n+  TEST(cbv1.get(), ());\n+  TEST(cbv2.get(), ());\n+  TEST_EQUAL(coding::CompressedBitVector::StorageStrategy::Sparse, cbv1->GetStorageStrategy(), ());\n+  TEST_EQUAL(coding::CompressedBitVector::StorageStrategy::Sparse, cbv2->GetStorageStrategy(), ());\n+\n+  auto cbv3 = coding::CompressedBitVector::Union(*cbv1, *cbv2);\n+  TEST(cbv3.get(), ());\n+  TEST_EQUAL(coding::CompressedBitVector::StorageStrategy::Sparse, cbv3->GetStorageStrategy(), ());\n+  CheckUnion(setBits1, setBits2, *cbv3);\n+}\n+\n+UNIT_TEST(CompressedBitVector_Union3)\n+{\n+  vector<uint64_t> setBits1 = {0, 1, 2, 3, 4, 5, 6};\n+\n+  vector<uint64_t> setBits2;\n+  for (int i = 0; i < 256; ++i)\n+    setBits2.push_back(i);\n+\n+  auto cbv1 = coding::CompressedBitVectorBuilder::FromBitPositions(setBits1);\n+  auto cbv2 = coding::CompressedBitVectorBuilder::FromBitPositions(setBits2);\n+  TEST(cbv1.get(), ());\n+  TEST(cbv2.get(), ());\n+  TEST_EQUAL(coding::CompressedBitVector::StorageStrategy::Dense, cbv1->GetStorageStrategy(), ());\n+  TEST_EQUAL(coding::CompressedBitVector::StorageStrategy::Dense, cbv2->GetStorageStrategy(), ());\n+\n+  auto cbv3 = coding::CompressedBitVector::Union(*cbv1, *cbv2);\n+  TEST(cbv3.get(), ());\n+  TEST_EQUAL(coding::CompressedBitVector::StorageStrategy::Dense, cbv3->GetStorageStrategy(), ());\n+  CheckUnion(setBits1, setBits2, *cbv3);\n+}\n+\n+UNIT_TEST(CompressedBitVector_Union4)\n+{\n+  vector<uint64_t> setBits1;\n+  for (int i = 0; i < coding::DenseCBV::kBlockSize; ++i)\n+    setBits1.push_back(i);\n+\n+  vector<uint64_t> setBits2 = {1000000000};\n+\n+  auto cbv1 = coding::CompressedBitVectorBuilder::FromBitPositions(setBits1);\n+  auto cbv2 = coding::CompressedBitVectorBuilder::FromBitPositions(setBits2);\n+  TEST(cbv1.get(), ());\n+  TEST(cbv2.get(), ());\n+  TEST_EQUAL(coding::CompressedBitVector::StorageStrategy::Dense, cbv1->GetStorageStrategy(), ());\n+  TEST_EQUAL(coding::CompressedBitVector::StorageStrategy::Sparse, cbv2->GetStorageStrategy(), ());\n+\n+  auto cbv3 = coding::CompressedBitVector::Union(*cbv1, *cbv2);\n+  TEST(cbv3.get(), ());\n+  TEST_EQUAL(coding::CompressedBitVector::StorageStrategy::Sparse, cbv3->GetStorageStrategy(), ());\n+\n+  CheckUnion(setBits1, setBits2, *cbv3);","path":"coding/coding_tests/compressed_bit_vector_test.cpp","position":142,"original_position":142,"commit_id":"f888a4fda0e271c7599f926dd113f74e057370cb","original_commit_id":"f888a4fda0e271c7599f926dd113f74e057370cb","user":{"login":"ygorshenin","id":454567,"avatar_url":"https://avatars.githubusercontent.com/u/454567?v=3","gravatar_id":"","url":"https://api.github.com/users/ygorshenin","html_url":"https://github.com/ygorshenin","followers_url":"https://api.github.com/users/ygorshenin/followers","following_url":"https://api.github.com/users/ygorshenin/following{/other_user}","gists_url":"https://api.github.com/users/ygorshenin/gists{/gist_id}","starred_url":"https://api.github.com/users/ygorshenin/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ygorshenin/subscriptions","organizations_url":"https://api.github.com/users/ygorshenin/orgs","repos_url":"https://api.github.com/users/ygorshenin/repos","events_url":"https://api.github.com/users/ygorshenin/events{/privacy}","received_events_url":"https://api.github.com/users/ygorshenin/received_events","type":"User","site_admin":false},"body":"Thanks, a lot of code gone away!","created_at":"2015-12-24T13:11:54Z","updated_at":"2015-12-24T13:11:54Z","html_url":"https://github.com/mapsme/omim/pull/1122#discussion_r48414026","pull_request_url":"https://api.github.com/repos/mapsme/omim/pulls/1122","_links":{"self":{"href":"https://api.github.com/repos/mapsme/omim/pulls/comments/48414026"},"html":{"href":"https://github.com/mapsme/omim/pull/1122#discussion_r48414026"},"pull_request":{"href":"https://api.github.com/repos/mapsme/omim/pulls/1122"}}},"pull_request":{"url":"https://api.github.com/repos/mapsme/omim/pulls/1122","id":54476659,"html_url":"https://github.com/mapsme/omim/pull/1122","diff_url":"https://github.com/mapsme/omim/pull/1122.diff","patch_url":"https://github.com/mapsme/omim/pull/1122.patch","issue_url":"https://api.github.com/repos/mapsme/omim/issues/1122","number":1122,"state":"open","locked":false,"title":"[search] Implemented search in locality.","user":{"login":"ygorshenin","id":454567,"avatar_url":"https://avatars.githubusercontent.com/u/454567?v=3","gravatar_id":"","url":"https://api.github.com/users/ygorshenin","html_url":"https://github.com/ygorshenin","followers_url":"https://api.github.com/users/ygorshenin/followers","following_url":"https://api.github.com/users/ygorshenin/following{/other_user}","gists_url":"https://api.github.com/users/ygorshenin/gists{/gist_id}","starred_url":"https://api.github.com/users/ygorshenin/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ygorshenin/subscriptions","organizations_url":"https://api.github.com/users/ygorshenin/orgs","repos_url":"https://api.github.com/users/ygorshenin/repos","events_url":"https://api.github.com/users/ygorshenin/events{/privacy}","received_events_url":"https://api.github.com/users/ygorshenin/received_events","type":"User","site_admin":false},"body":"","created_at":"2015-12-23T14:58:43Z","updated_at":"2015-12-24T13:11:54Z","closed_at":null,"merged_at":null,"merge_commit_sha":"ff6bdb4d6865493acff5ab8187c37ee2d747cf0d","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/mapsme/omim/pulls/1122/commits","review_comments_url":"https://api.github.com/repos/mapsme/omim/pulls/1122/comments","review_comment_url":"https://api.github.com/repos/mapsme/omim/pulls/comments{/number}","comments_url":"https://api.github.com/repos/mapsme/omim/issues/1122/comments","statuses_url":"https://api.github.com/repos/mapsme/omim/statuses/f888a4fda0e271c7599f926dd113f74e057370cb","head":{"label":"ygorshenin:implement-locality-search","ref":"implement-locality-search","sha":"f888a4fda0e271c7599f926dd113f74e057370cb","user":{"login":"ygorshenin","id":454567,"avatar_url":"https://avatars.githubusercontent.com/u/454567?v=3","gravatar_id":"","url":"https://api.github.com/users/ygorshenin","html_url":"https://github.com/ygorshenin","followers_url":"https://api.github.com/users/ygorshenin/followers","following_url":"https://api.github.com/users/ygorshenin/following{/other_user}","gists_url":"https://api.github.com/users/ygorshenin/gists{/gist_id}","starred_url":"https://api.github.com/users/ygorshenin/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ygorshenin/subscriptions","organizations_url":"https://api.github.com/users/ygorshenin/orgs","repos_url":"https://api.github.com/users/ygorshenin/repos","events_url":"https://api.github.com/users/ygorshenin/events{/privacy}","received_events_url":"https://api.github.com/users/ygorshenin/received_events","type":"User","site_admin":false},"repo":{"id":43427948,"name":"omim","full_name":"ygorshenin/omim","owner":{"login":"ygorshenin","id":454567,"avatar_url":"https://avatars.githubusercontent.com/u/454567?v=3","gravatar_id":"","url":"https://api.github.com/users/ygorshenin","html_url":"https://github.com/ygorshenin","followers_url":"https://api.github.com/users/ygorshenin/followers","following_url":"https://api.github.com/users/ygorshenin/following{/other_user}","gists_url":"https://api.github.com/users/ygorshenin/gists{/gist_id}","starred_url":"https://api.github.com/users/ygorshenin/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ygorshenin/subscriptions","organizations_url":"https://api.github.com/users/ygorshenin/orgs","repos_url":"https://api.github.com/users/ygorshenin/repos","events_url":"https://api.github.com/users/ygorshenin/events{/privacy}","received_events_url":"https://api.github.com/users/ygorshenin/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/ygorshenin/omim","description":"MAPS.ME - Offline OpenStreetMap maps for iOS/Android/Mac/Linux/Windows","fork":true,"url":"https://api.github.com/repos/ygorshenin/omim","forks_url":"https://api.github.com/repos/ygorshenin/omim/forks","keys_url":"https://api.github.com/repos/ygorshenin/omim/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ygorshenin/omim/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ygorshenin/omim/teams","hooks_url":"https://api.github.com/repos/ygorshenin/omim/hooks","issue_events_url":"https://api.github.com/repos/ygorshenin/omim/issues/events{/number}","events_url":"https://api.github.com/repos/ygorshenin/omim/events","assignees_url":"https://api.github.com/repos/ygorshenin/omim/assignees{/user}","branches_url":"https://api.github.com/repos/ygorshenin/omim/branches{/branch}","tags_url":"https://api.github.com/repos/ygorshenin/omim/tags","blobs_url":"https://api.github.com/repos/ygorshenin/omim/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ygorshenin/omim/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ygorshenin/omim/git/refs{/sha}","trees_url":"https://api.github.com/repos/ygorshenin/omim/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ygorshenin/omim/statuses/{sha}","languages_url":"https://api.github.com/repos/ygorshenin/omim/languages","stargazers_url":"https://api.github.com/repos/ygorshenin/omim/stargazers","contributors_url":"https://api.github.com/repos/ygorshenin/omim/contributors","subscribers_url":"https://api.github.com/repos/ygorshenin/omim/subscribers","subscription_url":"https://api.github.com/repos/ygorshenin/omim/subscription","commits_url":"https://api.github.com/repos/ygorshenin/omim/commits{/sha}","git_commits_url":"https://api.github.com/repos/ygorshenin/omim/git/commits{/sha}","comments_url":"https://api.github.com/repos/ygorshenin/omim/comments{/number}","issue_comment_url":"https://api.github.com/repos/ygorshenin/omim/issues/comments{/number}","contents_url":"https://api.github.com/repos/ygorshenin/omim/contents/{+path}","compare_url":"https://api.github.com/repos/ygorshenin/omim/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ygorshenin/omim/merges","archive_url":"https://api.github.com/repos/ygorshenin/omim/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ygorshenin/omim/downloads","issues_url":"https://api.github.com/repos/ygorshenin/omim/issues{/number}","pulls_url":"https://api.github.com/repos/ygorshenin/omim/pulls{/number}","milestones_url":"https://api.github.com/repos/ygorshenin/omim/milestones{/number}","notifications_url":"https://api.github.com/repos/ygorshenin/omim/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ygorshenin/omim/labels{/name}","releases_url":"https://api.github.com/repos/ygorshenin/omim/releases{/id}","created_at":"2015-09-30T10:56:11Z","updated_at":"2015-09-30T10:58:25Z","pushed_at":"2015-12-24T10:51:18Z","git_url":"git://github.com/ygorshenin/omim.git","ssh_url":"git@github.com:ygorshenin/omim.git","clone_url":"https://github.com/ygorshenin/omim.git","svn_url":"https://github.com/ygorshenin/omim","homepage":null,"size":1929929,"stargazers_count":0,"watchers_count":0,"language":"C++","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":"master"}},"base":{"label":"mapsme:new-search","ref":"new-search","sha":"318aa068b789a26ecba20be75518feea806132ba","user":{"login":"mapsme","id":14185141,"avatar_url":"https://avatars.githubusercontent.com/u/14185141?v=3","gravatar_id":"","url":"https://api.github.com/users/mapsme","html_url":"https://github.com/mapsme","followers_url":"https://api.github.com/users/mapsme/followers","following_url":"https://api.github.com/users/mapsme/following{/other_user}","gists_url":"https://api.github.com/users/mapsme/gists{/gist_id}","starred_url":"https://api.github.com/users/mapsme/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mapsme/subscriptions","organizations_url":"https://api.github.com/users/mapsme/orgs","repos_url":"https://api.github.com/users/mapsme/repos","events_url":"https://api.github.com/users/mapsme/events{/privacy}","received_events_url":"https://api.github.com/users/mapsme/received_events","type":"Organization","site_admin":false},"repo":{"id":42798033,"name":"omim","full_name":"mapsme/omim","owner":{"login":"mapsme","id":14185141,"avatar_url":"https://avatars.githubusercontent.com/u/14185141?v=3","gravatar_id":"","url":"https://api.github.com/users/mapsme","html_url":"https://github.com/mapsme","followers_url":"https://api.github.com/users/mapsme/followers","following_url":"https://api.github.com/users/mapsme/following{/other_user}","gists_url":"https://api.github.com/users/mapsme/gists{/gist_id}","starred_url":"https://api.github.com/users/mapsme/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mapsme/subscriptions","organizations_url":"https://api.github.com/users/mapsme/orgs","repos_url":"https://api.github.com/users/mapsme/repos","events_url":"https://api.github.com/users/mapsme/events{/privacy}","received_events_url":"https://api.github.com/users/mapsme/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/mapsme/omim","description":"MAPS.ME - Offline OpenStreetMap maps for iOS/Android/Mac/Linux/Windows","fork":false,"url":"https://api.github.com/repos/mapsme/omim","forks_url":"https://api.github.com/repos/mapsme/omim/forks","keys_url":"https://api.github.com/repos/mapsme/omim/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mapsme/omim/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mapsme/omim/teams","hooks_url":"https://api.github.com/repos/mapsme/omim/hooks","issue_events_url":"https://api.github.com/repos/mapsme/omim/issues/events{/number}","events_url":"https://api.github.com/repos/mapsme/omim/events","assignees_url":"https://api.github.com/repos/mapsme/omim/assignees{/user}","branches_url":"https://api.github.com/repos/mapsme/omim/branches{/branch}","tags_url":"https://api.github.com/repos/mapsme/omim/tags","blobs_url":"https://api.github.com/repos/mapsme/omim/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mapsme/omim/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mapsme/omim/git/refs{/sha}","trees_url":"https://api.github.com/repos/mapsme/omim/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mapsme/omim/statuses/{sha}","languages_url":"https://api.github.com/repos/mapsme/omim/languages","stargazers_url":"https://api.github.com/repos/mapsme/omim/stargazers","contributors_url":"https://api.github.com/repos/mapsme/omim/contributors","subscribers_url":"https://api.github.com/repos/mapsme/omim/subscribers","subscription_url":"https://api.github.com/repos/mapsme/omim/subscription","commits_url":"https://api.github.com/repos/mapsme/omim/commits{/sha}","git_commits_url":"https://api.github.com/repos/mapsme/omim/git/commits{/sha}","comments_url":"https://api.github.com/repos/mapsme/omim/comments{/number}","issue_comment_url":"https://api.github.com/repos/mapsme/omim/issues/comments{/number}","contents_url":"https://api.github.com/repos/mapsme/omim/contents/{+path}","compare_url":"https://api.github.com/repos/mapsme/omim/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mapsme/omim/merges","archive_url":"https://api.github.com/repos/mapsme/omim/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mapsme/omim/downloads","issues_url":"https://api.github.com/repos/mapsme/omim/issues{/number}","pulls_url":"https://api.github.com/repos/mapsme/omim/pulls{/number}","milestones_url":"https://api.github.com/repos/mapsme/omim/milestones{/number}","notifications_url":"https://api.github.com/repos/mapsme/omim/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mapsme/omim/labels{/name}","releases_url":"https://api.github.com/repos/mapsme/omim/releases{/id}","created_at":"2015-09-20T02:57:13Z","updated_at":"2015-12-24T12:31:12Z","pushed_at":"2015-12-24T13:07:44Z","git_url":"git://github.com/mapsme/omim.git","ssh_url":"git@github.com:mapsme/omim.git","clone_url":"https://github.com/mapsme/omim.git","svn_url":"https://github.com/mapsme/omim","homepage":null,"size":2012333,"stargazers_count":1545,"watchers_count":1545,"language":"C++","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":196,"mirror_url":null,"open_issues_count":89,"forks":196,"open_issues":89,"watchers":1545,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/mapsme/omim/pulls/1122"},"html":{"href":"https://github.com/mapsme/omim/pull/1122"},"issue":{"href":"https://api.github.com/repos/mapsme/omim/issues/1122"},"comments":{"href":"https://api.github.com/repos/mapsme/omim/issues/1122/comments"},"review_comments":{"href":"https://api.github.com/repos/mapsme/omim/pulls/1122/comments"},"review_comment":{"href":"https://api.github.com/repos/mapsme/omim/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/mapsme/omim/pulls/1122/commits"},"statuses":{"href":"https://api.github.com/repos/mapsme/omim/statuses/f888a4fda0e271c7599f926dd113f74e057370cb"}}}}