Merge lp://staging/~cuteyw/drizzle/cloud-storage-engine-using-json-row-buffer-format into lp://staging/~drizzle-trunk/drizzle/development

Proposed by Wei Ye
Status: Work in progress
Proposed branch: lp://staging/~cuteyw/drizzle/cloud-storage-engine-using-json-row-buffer-format
Merge into: lp://staging/~drizzle-trunk/drizzle/development
Diff against target: 3103 lines (+2930/-0)
34 files modified
plugin/cloud_storage/awss3_service.cc (+451/-0)
plugin/cloud_storage/awss3_service.h (+75/-0)
plugin/cloud_storage/base64.cc (+78/-0)
plugin/cloud_storage/base64.h (+32/-0)
plugin/cloud_storage/cloud_storage_service.h (+84/-0)
plugin/cloud_storage/curl.cc (+281/-0)
plugin/cloud_storage/curl.h (+130/-0)
plugin/cloud_storage/ha_cloud.cc (+1187/-0)
plugin/cloud_storage/ha_cloud.h (+148/-0)
plugin/cloud_storage/plugin.ac (+3/-0)
plugin/cloud_storage/plugin.ini (+8/-0)
plugin/cloud_storage/str_percent.cc (+67/-0)
plugin/cloud_storage/str_percent.h (+36/-0)
plugin/cloud_storage/tests/r/basic_create_table.result (+19/-0)
plugin/cloud_storage/tests/r/basic_delete.result (+24/-0)
plugin/cloud_storage/tests/r/basic_insert.result (+21/-0)
plugin/cloud_storage/tests/r/basic_select.result (+18/-0)
plugin/cloud_storage/tests/r/basic_update.result (+21/-0)
plugin/cloud_storage/tests/r/multi_column.result (+26/-0)
plugin/cloud_storage/tests/r/nullable_or_empty_column.result (+16/-0)
plugin/cloud_storage/tests/t/basic_create_table-master.opt (+1/-0)
plugin/cloud_storage/tests/t/basic_create_table.test (+31/-0)
plugin/cloud_storage/tests/t/basic_delete-master.opt (+1/-0)
plugin/cloud_storage/tests/t/basic_delete.test (+29/-0)
plugin/cloud_storage/tests/t/basic_insert-master.opt (+1/-0)
plugin/cloud_storage/tests/t/basic_insert.test (+26/-0)
plugin/cloud_storage/tests/t/basic_select-master.opt (+1/-0)
plugin/cloud_storage/tests/t/basic_select.test (+21/-0)
plugin/cloud_storage/tests/t/basic_update-master.opt (+1/-0)
plugin/cloud_storage/tests/t/basic_update.test (+28/-0)
plugin/cloud_storage/tests/t/multi_column-master.opt (+1/-0)
plugin/cloud_storage/tests/t/multi_column.test (+41/-0)
plugin/cloud_storage/tests/t/nullable_or_empty_column.opt (+1/-0)
plugin/cloud_storage/tests/t/nullable_or_empty_column.test (+22/-0)
To merge this branch: bzr merge lp://staging/~cuteyw/drizzle/cloud-storage-engine-using-json-row-buffer-format
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Stewart Smith Pending
Mark Atwood Pending
Monty Taylor Pending
Review via email: mp+32831@code.staging.launchpad.net

This proposal supersedes a proposal from 2010-08-16.

To post a comment you must log in.
1696. By cactus <cactus@cactus-desktop>

merge

Unmerged revisions

1696. By cactus <cactus@cactus-desktop>

merge

1695. By cactus <cactus@cactus-desktop>

update header of ha_cloud.cc

1694. By cactus <cactus@cactus-desktop>

change row buffer fomat from csv to json, and now support nullable column

1693. By cactus <cactus@cactus-desktop>

AWSS3Service can send and receive binary data now

1692. By cactus <cactus@cactus-desktop>

adjust to lock api

1691. By cactus <cactus@cactus-desktop>

add update test

1690. By cactus <cactus@cactus-desktop>

merge

1689. By cactus <cactus@cactus-desktop>

update test

1688. By cactus <cactus@cactus-desktop>

update test

1687. By cactus <cactus@cactus-desktop>

update test result

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.