{"action":"created","comment":{"url":"https://api.github.com/repos/larryxiao/peloton-1/pulls/comments/62677656","id":62677656,"diff_hunk":"@@ -158,6 +158,14 @@ third_party/nvml/\n third_party/logcabin/\n \n #==============================================================================#\n+<<<<<<< HEAD","path":".gitignore","position":4,"original_position":4,"commit_id":"91da3912808ebfe68ca4077c83b3271686cea5f4","original_commit_id":"91da3912808ebfe68ca4077c83b3271686cea5f4","user":{"login":"YangMann","id":4034481,"avatar_url":"https://avatars.githubusercontent.com/u/4034481?v=3","gravatar_id":"","url":"https://api.github.com/users/YangMann","html_url":"https://github.com/YangMann","followers_url":"https://api.github.com/users/YangMann/followers","following_url":"https://api.github.com/users/YangMann/following{/other_user}","gists_url":"https://api.github.com/users/YangMann/gists{/gist_id}","starred_url":"https://api.github.com/users/YangMann/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/YangMann/subscriptions","organizations_url":"https://api.github.com/users/YangMann/orgs","repos_url":"https://api.github.com/users/YangMann/repos","events_url":"https://api.github.com/users/YangMann/events{/privacy}","received_events_url":"https://api.github.com/users/YangMann/received_events","type":"User","site_admin":false},"body":"This seems like a merge conflict. It's better to resolve it before pull request.","created_at":"2016-05-10T14:09:23Z","updated_at":"2016-05-10T14:09:23Z","html_url":"https://github.com/larryxiao/peloton-1/pull/1#discussion_r62677656","pull_request_url":"https://api.github.com/repos/larryxiao/peloton-1/pulls/1","_links":{"self":{"href":"https://api.github.com/repos/larryxiao/peloton-1/pulls/comments/62677656"},"html":{"href":"https://github.com/larryxiao/peloton-1/pull/1#discussion_r62677656"},"pull_request":{"href":"https://api.github.com/repos/larryxiao/peloton-1/pulls/1"}}},"pull_request":{"url":"https://api.github.com/repos/larryxiao/peloton-1/pulls/1","id":69446836,"html_url":"https://github.com/larryxiao/peloton-1/pull/1","diff_url":"https://github.com/larryxiao/peloton-1/pull/1.diff","patch_url":"https://github.com/larryxiao/peloton-1/pull/1.patch","issue_url":"https://api.github.com/repos/larryxiao/peloton-1/issues/1","number":1,"state":"open","locked":false,"title":"Wire Protocol + Memcached Pull Request","user":{"login":"sid1607","id":2364222,"avatar_url":"https://avatars.githubusercontent.com/u/2364222?v=3","gravatar_id":"","url":"https://api.github.com/users/sid1607","html_url":"https://github.com/sid1607","followers_url":"https://api.github.com/users/sid1607/followers","following_url":"https://api.github.com/users/sid1607/following{/other_user}","gists_url":"https://api.github.com/users/sid1607/gists{/gist_id}","starred_url":"https://api.github.com/users/sid1607/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sid1607/subscriptions","organizations_url":"https://api.github.com/users/sid1607/orgs","repos_url":"https://api.github.com/users/sid1607/repos","events_url":"https://api.github.com/users/sid1607/events{/privacy}","received_events_url":"https://api.github.com/users/sid1607/received_events","type":"User","site_admin":false},"body":"# **The Wire Protocol**\r\n\r\n**Description**\r\nThis is a prototype implementation of the Postgres wire protocol in C++ in order to support communication with Postgres shell and JDBC clients with Peloton. To test the correctness of the implementation, this protocol is backed against Sqlite. This helps us provide the required database support for fully executing the YCSB and TPCC benchmarks and inspecting whether this protocol design can potentially support these benchmarks.\r\n\r\nThe Sqlite sources have been included in the source folder for the wire protocol, to avoid introducing Sqlite linking dependencies in the Peloton Makefiles.\r\n\r\nThe protocol abstracts the server-client interaction for every query through packet formats. The full details about the protocol can be found in  [the Postgres Documentation](http://www.postgresql.org/docs/9.2/static/protocol.html).\r\n\r\n**Preliminary results**\r\nThe underlying socket layer has been evaluated to support (over a single connection)\r\n- ~70,000 NOPs (empty queries) per second\r\n- ~12,000 exact-match queries per second\r\n\r\n**Deployment and Testing**\r\n- Build by using the [standard peloton make and install](https://github.com/cmu-db/peloton/wiki/Installation)\r\n\r\n- The _wire\\_server_ using wire_server binary (ex: **>** wire_server 57721). The wire_server behaves similarly to the Postgres Server.\r\n\r\n- build/tests/wire_test can be used for elementary testing\r\n\r\n- using psql shell pointed to wire_server's port can be used to run simple queries. Any of the SQL tests in scripts/testing could be used to test the Simple Query Protocol\r\n\r\n- Use scripts/testing/jdbc/test-jdbc.sh to test the Extended Query Protocol\r\n\r\n- Run oltpbench/ycsb for more comprehensive tests\r\n\r\n@studentX - Add details about using memcached\r\n","created_at":"2016-05-10T04:16:59Z","updated_at":"2016-05-10T14:09:23Z","closed_at":null,"merged_at":null,"merge_commit_sha":"238555b0f5fe021c457d25b55ad7c22e07227ee3","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/larryxiao/peloton-1/pulls/1/commits","review_comments_url":"https://api.github.com/repos/larryxiao/peloton-1/pulls/1/comments","review_comment_url":"https://api.github.com/repos/larryxiao/peloton-1/pulls/comments{/number}","comments_url":"https://api.github.com/repos/larryxiao/peloton-1/issues/1/comments","statuses_url":"https://api.github.com/repos/larryxiao/peloton-1/statuses/91da3912808ebfe68ca4077c83b3271686cea5f4","head":{"label":"sid1607:master","ref":"master","sha":"91da3912808ebfe68ca4077c83b3271686cea5f4","user":{"login":"sid1607","id":2364222,"avatar_url":"https://avatars.githubusercontent.com/u/2364222?v=3","gravatar_id":"","url":"https://api.github.com/users/sid1607","html_url":"https://github.com/sid1607","followers_url":"https://api.github.com/users/sid1607/followers","following_url":"https://api.github.com/users/sid1607/following{/other_user}","gists_url":"https://api.github.com/users/sid1607/gists{/gist_id}","starred_url":"https://api.github.com/users/sid1607/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sid1607/subscriptions","organizations_url":"https://api.github.com/users/sid1607/orgs","repos_url":"https://api.github.com/users/sid1607/repos","events_url":"https://api.github.com/users/sid1607/events{/privacy}","received_events_url":"https://api.github.com/users/sid1607/received_events","type":"User","site_admin":false},"repo":{"id":58425272,"name":"peloton-1","full_name":"sid1607/peloton-1","owner":{"login":"sid1607","id":2364222,"avatar_url":"https://avatars.githubusercontent.com/u/2364222?v=3","gravatar_id":"","url":"https://api.github.com/users/sid1607","html_url":"https://github.com/sid1607","followers_url":"https://api.github.com/users/sid1607/followers","following_url":"https://api.github.com/users/sid1607/following{/other_user}","gists_url":"https://api.github.com/users/sid1607/gists{/gist_id}","starred_url":"https://api.github.com/users/sid1607/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sid1607/subscriptions","organizations_url":"https://api.github.com/users/sid1607/orgs","repos_url":"https://api.github.com/users/sid1607/repos","events_url":"https://api.github.com/users/sid1607/events{/privacy}","received_events_url":"https://api.github.com/users/sid1607/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/sid1607/peloton-1","description":"The Self-Driving Database Management System","fork":true,"url":"https://api.github.com/repos/sid1607/peloton-1","forks_url":"https://api.github.com/repos/sid1607/peloton-1/forks","keys_url":"https://api.github.com/repos/sid1607/peloton-1/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sid1607/peloton-1/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sid1607/peloton-1/teams","hooks_url":"https://api.github.com/repos/sid1607/peloton-1/hooks","issue_events_url":"https://api.github.com/repos/sid1607/peloton-1/issues/events{/number}","events_url":"https://api.github.com/repos/sid1607/peloton-1/events","assignees_url":"https://api.github.com/repos/sid1607/peloton-1/assignees{/user}","branches_url":"https://api.github.com/repos/sid1607/peloton-1/branches{/branch}","tags_url":"https://api.github.com/repos/sid1607/peloton-1/tags","blobs_url":"https://api.github.com/repos/sid1607/peloton-1/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sid1607/peloton-1/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sid1607/peloton-1/git/refs{/sha}","trees_url":"https://api.github.com/repos/sid1607/peloton-1/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sid1607/peloton-1/statuses/{sha}","languages_url":"https://api.github.com/repos/sid1607/peloton-1/languages","stargazers_url":"https://api.github.com/repos/sid1607/peloton-1/stargazers","contributors_url":"https://api.github.com/repos/sid1607/peloton-1/contributors","subscribers_url":"https://api.github.com/repos/sid1607/peloton-1/subscribers","subscription_url":"https://api.github.com/repos/sid1607/peloton-1/subscription","commits_url":"https://api.github.com/repos/sid1607/peloton-1/commits{/sha}","git_commits_url":"https://api.github.com/repos/sid1607/peloton-1/git/commits{/sha}","comments_url":"https://api.github.com/repos/sid1607/peloton-1/comments{/number}","issue_comment_url":"https://api.github.com/repos/sid1607/peloton-1/issues/comments{/number}","contents_url":"https://api.github.com/repos/sid1607/peloton-1/contents/{+path}","compare_url":"https://api.github.com/repos/sid1607/peloton-1/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sid1607/peloton-1/merges","archive_url":"https://api.github.com/repos/sid1607/peloton-1/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sid1607/peloton-1/downloads","issues_url":"https://api.github.com/repos/sid1607/peloton-1/issues{/number}","pulls_url":"https://api.github.com/repos/sid1607/peloton-1/pulls{/number}","milestones_url":"https://api.github.com/repos/sid1607/peloton-1/milestones{/number}","notifications_url":"https://api.github.com/repos/sid1607/peloton-1/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sid1607/peloton-1/labels{/name}","releases_url":"https://api.github.com/repos/sid1607/peloton-1/releases{/id}","deployments_url":"https://api.github.com/repos/sid1607/peloton-1/deployments","created_at":"2016-05-10T02:58:34Z","updated_at":"2016-05-10T02:58:44Z","pushed_at":"2016-05-10T10:36:57Z","git_url":"git://github.com/sid1607/peloton-1.git","ssh_url":"git@github.com:sid1607/peloton-1.git","clone_url":"https://github.com/sid1607/peloton-1.git","svn_url":"https://github.com/sid1607/peloton-1","homepage":"http://pelotondb.org","size":43435,"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":"larryxiao:master","ref":"master","sha":"e1c82e041bdb00356ad1592f702b4f59a222098f","user":{"login":"larryxiao","id":3643298,"avatar_url":"https://avatars.githubusercontent.com/u/3643298?v=3","gravatar_id":"","url":"https://api.github.com/users/larryxiao","html_url":"https://github.com/larryxiao","followers_url":"https://api.github.com/users/larryxiao/followers","following_url":"https://api.github.com/users/larryxiao/following{/other_user}","gists_url":"https://api.github.com/users/larryxiao/gists{/gist_id}","starred_url":"https://api.github.com/users/larryxiao/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/larryxiao/subscriptions","organizations_url":"https://api.github.com/users/larryxiao/orgs","repos_url":"https://api.github.com/users/larryxiao/repos","events_url":"https://api.github.com/users/larryxiao/events{/privacy}","received_events_url":"https://api.github.com/users/larryxiao/received_events","type":"User","site_admin":false},"repo":{"id":58146836,"name":"peloton-1","full_name":"larryxiao/peloton-1","owner":{"login":"larryxiao","id":3643298,"avatar_url":"https://avatars.githubusercontent.com/u/3643298?v=3","gravatar_id":"","url":"https://api.github.com/users/larryxiao","html_url":"https://github.com/larryxiao","followers_url":"https://api.github.com/users/larryxiao/followers","following_url":"https://api.github.com/users/larryxiao/following{/other_user}","gists_url":"https://api.github.com/users/larryxiao/gists{/gist_id}","starred_url":"https://api.github.com/users/larryxiao/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/larryxiao/subscriptions","organizations_url":"https://api.github.com/users/larryxiao/orgs","repos_url":"https://api.github.com/users/larryxiao/repos","events_url":"https://api.github.com/users/larryxiao/events{/privacy}","received_events_url":"https://api.github.com/users/larryxiao/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/larryxiao/peloton-1","description":"Street Strength Database Management System for Real-Time Analytics","fork":true,"url":"https://api.github.com/repos/larryxiao/peloton-1","forks_url":"https://api.github.com/repos/larryxiao/peloton-1/forks","keys_url":"https://api.github.com/repos/larryxiao/peloton-1/keys{/key_id}","collaborators_url":"https://api.github.com/repos/larryxiao/peloton-1/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/larryxiao/peloton-1/teams","hooks_url":"https://api.github.com/repos/larryxiao/peloton-1/hooks","issue_events_url":"https://api.github.com/repos/larryxiao/peloton-1/issues/events{/number}","events_url":"https://api.github.com/repos/larryxiao/peloton-1/events","assignees_url":"https://api.github.com/repos/larryxiao/peloton-1/assignees{/user}","branches_url":"https://api.github.com/repos/larryxiao/peloton-1/branches{/branch}","tags_url":"https://api.github.com/repos/larryxiao/peloton-1/tags","blobs_url":"https://api.github.com/repos/larryxiao/peloton-1/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/larryxiao/peloton-1/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/larryxiao/peloton-1/git/refs{/sha}","trees_url":"https://api.github.com/repos/larryxiao/peloton-1/git/trees{/sha}","statuses_url":"https://api.github.com/repos/larryxiao/peloton-1/statuses/{sha}","languages_url":"https://api.github.com/repos/larryxiao/peloton-1/languages","stargazers_url":"https://api.github.com/repos/larryxiao/peloton-1/stargazers","contributors_url":"https://api.github.com/repos/larryxiao/peloton-1/contributors","subscribers_url":"https://api.github.com/repos/larryxiao/peloton-1/subscribers","subscription_url":"https://api.github.com/repos/larryxiao/peloton-1/subscription","commits_url":"https://api.github.com/repos/larryxiao/peloton-1/commits{/sha}","git_commits_url":"https://api.github.com/repos/larryxiao/peloton-1/git/commits{/sha}","comments_url":"https://api.github.com/repos/larryxiao/peloton-1/comments{/number}","issue_comment_url":"https://api.github.com/repos/larryxiao/peloton-1/issues/comments{/number}","contents_url":"https://api.github.com/repos/larryxiao/peloton-1/contents/{+path}","compare_url":"https://api.github.com/repos/larryxiao/peloton-1/compare/{base}...{head}","merges_url":"https://api.github.com/repos/larryxiao/peloton-1/merges","archive_url":"https://api.github.com/repos/larryxiao/peloton-1/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/larryxiao/peloton-1/downloads","issues_url":"https://api.github.com/repos/larryxiao/peloton-1/issues{/number}","pulls_url":"https://api.github.com/repos/larryxiao/peloton-1/pulls{/number}","milestones_url":"https://api.github.com/repos/larryxiao/peloton-1/milestones{/number}","notifications_url":"https://api.github.com/repos/larryxiao/peloton-1/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/larryxiao/peloton-1/labels{/name}","releases_url":"https://api.github.com/repos/larryxiao/peloton-1/releases{/id}","deployments_url":"https://api.github.com/repos/larryxiao/peloton-1/deployments","created_at":"2016-05-05T16:56:45Z","updated_at":"2016-05-05T16:56:54Z","pushed_at":"2016-05-10T10:35:02Z","git_url":"git://github.com/larryxiao/peloton-1.git","ssh_url":"git@github.com:larryxiao/peloton-1.git","clone_url":"https://github.com/larryxiao/peloton-1.git","svn_url":"https://github.com/larryxiao/peloton-1","homepage":"http://pelotondb.org","size":41275,"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":1,"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/larryxiao/peloton-1/pulls/1"},"html":{"href":"https://github.com/larryxiao/peloton-1/pull/1"},"issue":{"href":"https://api.github.com/repos/larryxiao/peloton-1/issues/1"},"comments":{"href":"https://api.github.com/repos/larryxiao/peloton-1/issues/1/comments"},"review_comments":{"href":"https://api.github.com/repos/larryxiao/peloton-1/pulls/1/comments"},"review_comment":{"href":"https://api.github.com/repos/larryxiao/peloton-1/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/larryxiao/peloton-1/pulls/1/commits"},"statuses":{"href":"https://api.github.com/repos/larryxiao/peloton-1/statuses/91da3912808ebfe68ca4077c83b3271686cea5f4"}}}}