Browse files

Merge branch 'master' into pevm-list-timeouts

  • Loading branch information...
2 parents 298eb77 + 68a422d commit 53447a02f548dfea7304f67effcd15311c177aa7 @evanmcc evanmcc committed May 8, 2013
Showing with 212 additions and 16 deletions.
  1. +178 −0 LICENSE
  2. +0 −2
  3. +2 −0 Makefile
  4. +1 −4
  5. +12 −4 src/riak.proto
  6. +19 −6 src/riak_pb_codec.erl
@@ -0,0 +1,178 @@
+ Apache License
+ Version 2.0, January 2004
+ 1. Definitions.
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ implied, including, without limitation, any warranties or conditions
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
@@ -1,2 +0,0 @@
-include src/*.proto
@@ -31,10 +31,12 @@ erl_test: erl_compile
# Python specific build steps
@echo "==> Python (compile)"
+ @protoc -Isrc --python_out=riak_pb src/*.proto
@./ build
@echo "==> Python (clean)"
+ @rm -f riak_pb/*
@./ clean
python_release: python_compile
@@ -1,7 +1,6 @@
#!/usr/bin/env python
from setuptools import setup
-from proto_cmd import build_proto, clean_proto
@@ -19,7 +18,5 @@
classifiers=['License :: OSI Approved :: Apache Software License',
'Intended Audience :: Developers',
'Operating System :: OS Independent',
- 'Topic :: Database'],
- cmdclass={'build_proto': build_proto,
- 'clean': clean_proto}
+ 'Topic :: Database']
@@ -68,6 +68,14 @@ message RpbSetBucketReq {
// Set bucket properties response - no message defined, just send
// RpbSetBucketResp
+// Reset bucket properties request
+message RpbResetBucketReq {
+ required bytes bucket = 1;
+// Reset bucket properties response - no message defined, just send
+// RpbResetBucketResp
// Module-Function pairs for commit hooks and other bucket properties
// that take functions
message RpbModFun {
@@ -117,10 +125,10 @@ message RpbBucketProps {
// Used by riak_repl bucket fixup
enum RpbReplMode {
- false = 0;
- realtime = 1;
- fullsync = 2;
- true = 3;
+ FALSE = 0;
+ TRUE = 3;
optional RpbReplMode repl = 24;
@@ -117,6 +117,8 @@ msg_type(25) -> rpbindexreq;
msg_type(26) -> rpbindexresp;
msg_type(27) -> rpbsearchqueryreq;
msg_type(28) -> rpbsearchqueryresp;
+msg_type(29) -> rpbresetbucketreq;
+msg_type(30) -> rpbresetbucketresp;
msg_type(_) -> undefined.
%% @doc Converts a symbolic message name into a message code. Replaces
@@ -150,12 +152,15 @@ msg_code(rpbmapredresp) -> 24;
msg_code(rpbindexreq) -> 25;
msg_code(rpbindexresp) -> 26;
msg_code(rpbsearchqueryreq) -> 27;
-msg_code(rpbsearchqueryresp) -> 28.
+msg_code(rpbsearchqueryresp) -> 28;
+msg_code(rpbresetbucketreq) -> 29;
+msg_code(rpbresetbucketresp) -> 30.
%% @doc Selects the appropriate PB decoder for a message code.
-spec decoder_for(pos_integer()) -> module().
decoder_for(N) when N >= 0, N < 3;
- N == 7; N == 8 ->
+ N == 7; N == 8;
+ N == 29; N == 30 ->
decoder_for(N) when N >= 3, N < 7;
N >= 9, N =< 26->
@@ -275,7 +280,7 @@ decode_bucket_props(#rpbbucketprops{n_val=N,
Q /= undefined ] ++
%% Extract repl prop
- [ {repl, Repl} || Repl /= undefined ].
+ [ {repl, decode_repl(Repl)} || Repl /= undefined ].
%% @doc Convert a property list to an RpbBucketProps message
@@ -396,6 +401,14 @@ decode_commit_hook(#rpbcommithook{modfun = Modfun}) when Modfun =/= undefined ->
decode_commit_hook(#rpbcommithook{name = Name}) when Name =/= undefined ->
{struct, [{<<"name">>, Name}]}.
-encode_repl(Bin) when is_binary(Bin) -> binary_to_existing_atom(Bin, latin1);
-encode_repl(both) -> true;
-encode_repl(A) -> A.
+encode_repl(Bin) when is_binary(Bin) -> encode_repl(binary_to_existing_atom(Bin, latin1));
+encode_repl(both) -> 'TRUE';
+encode_repl(true) -> 'TRUE';
+encode_repl(false) -> 'FALSE';
+encode_repl(realtime) -> 'REALTIME';
+encode_repl(fullsync) -> 'FULLSYNC'.
+decode_repl('TRUE') -> true;
+decode_repl('FALSE') -> false;
+decode_repl('REALTIME') -> realtime;
+decode_repl('FULLSYNC') -> fullsync.

0 comments on commit 53447a0

Please sign in to comment.