basho / riak_pb

Riak Protocol Buffers Messages
Apache License 2.0
70 stars 114 forks source link

Merge sweeper code to develop #216

Closed nickelization closed 7 years ago

nickelization commented 7 years ago

This adds support for the TTL property.

thumbot commented 7 years ago

Thanks @nickelization!

Settings ```yaml --- minimum_reviewers: 2 merge: true build_steps: - make clean - make deps - make compile - make test - make xref - make dialyzer org_mode: true timeout: 1800 ```
thumbot commented 7 years ago
sweeper-develop-merge f51ded9 :arrow_right: develop cb15cc4 :white_check_mark: completed
Looks good! :+1:
:white_check_mark: MERGE

> Started at: 2016-12-06 10:28 > Duration: 1 seconds. > Result: OK > Message: Merge Success: sweeper-develop-merge f51ded91492d1951f10bae510b903b62962875b3 onto target branch: develop cb15cc4770f3748289ba56245d62b1c0d07c33f7 > Exit Code: OK > :page_facing_up:

``` Merge made by the 'recursive' strategy. dialyzer.ignore-warnings | 1 - include/riak_pb_kv_codec.hrl | 3 ++- src/riak.proto | 3 +++ src/riak_kv.proto | 1 + src/riak_pb_codec.erl | 5 ++++- src/riak_pb_kv_codec.erl | 27 ++++++++++++++++----------- 6 files changed, 26 insertions(+), 14 deletions(-) ``` --------------------------------------------------
:white_check_mark: MAKE_CLEAN

> Started at: 2016-12-06 10:28 > Duration: 1 seconds. > Result: OK > Message: OK > Exit Code: 0 > :page_facing_up:

``` cd /tmp/thumbs/develop.cb15cc4.sweeper-develop-merge.f51ded9; make clean ==> develop.cb15cc4.sweeper-develop-merge.f51ded9 (pre_clean) ==> develop.cb15cc4.sweeper-develop-merge.f51ded9 (clean) ``` --------------------------------------------------
:white_check_mark: MAKE_DEPS

> Started at: 2016-12-06 10:28 > Duration: 3 seconds. > Result: OK > Message: OK > Exit Code: 0 > :page_facing_up:

``` cd /tmp/thumbs/develop.cb15cc4.sweeper-develop-merge.f51ded9; make deps ==> develop.cb15cc4.sweeper-develop-merge.f51ded9 (get-deps) Pulling protobuffs from {git,"https://github.com/basho/erlang_protobuffs.git", {tag,"0.9.0"}} Cloning into 'protobuffs'... Pulling hamcrest from {git,"https://github.com/basho/hamcrest-erlang.git", {tag,"0.3.0-basho"}} Cloning into 'hamcrest'... ==> protobuffs (get-deps) Pulling meck from {git,"https://github.com/basho/meck.git",{tag,"0.8.2"}} Cloning into 'meck'... ==> meck (get-deps) ==> hamcrest (get-deps) ``` --------------------------------------------------
:white_check_mark: MAKE_COMPILE

> Started at: 2016-12-06 10:28 > Duration: 4 seconds. > Result: OK > Message: OK > Exit Code: 0 > :page_facing_up:

``` cd /tmp/thumbs/develop.cb15cc4.sweeper-develop-merge.f51ded9; make compile ==> meck (pre_compile) ==> meck (compile) Compiled src/meck_cover.erl Compiled src/meck_expect.erl Compiled src/meck_args_matcher.erl Compiled src/meck_matcher.erl Compiled src/meck_code_gen.erl Compiled src/meck_history.erl Compiled src/meck.erl Compiled src/meck_code.erl Compiled src/meck_util.erl Compiled src/meck_ret_spec.erl Compiled src/meck_proc.erl ==> protobuffs (pre_compile) ==> protobuffs (compile) Compiled src/protobuffs_scanner.xrl Compiled src/protobuffs_parser.yrl Compiled src/protobuffs_cli.erl Compiled src/protobuffs.erl Compiled src/pokemon_pb.erl Compiled src/protobuffs_file.erl Compiled src/protobuffs_scanner.erl Compiled src/protobuffs_parser.erl Compiled src/protobuffs_compile.erl ==> hamcrest (pre_compile) ==> hamcrest (compile) Compiled src/hamcrest.erl Compiled src/hamcrest_term.erl Compiled src/hamcrest_matchers.erl ==> hamcrest (post_compile) ==> develop.cb15cc4.sweeper-develop-merge.f51ded9 (pre_compile) Generated src/riak_pb_messages.erl ==> develop.cb15cc4.sweeper-develop-merge.f51ded9 (compile) Compiling src/riak_kv.proto =INFO REPORT==== 6-Dec-2016::10:28:35 === Writing header file to "riak_kv_pb.hrl" =INFO REPORT==== 6-Dec-2016::10:28:35 === Writing beam file to "riak_kv_pb.beam" Compiling src/riak_dt.proto =INFO REPORT==== 6-Dec-2016::10:28:35 === Writing header file to "riak_dt_pb.hrl" =INFO REPORT==== 6-Dec-2016::10:28:35 === Writing beam file to "riak_dt_pb.beam" Compiling src/riak_yokozuna.proto =INFO REPORT==== 6-Dec-2016::10:28:35 === Writing header file to "riak_yokozuna_pb.hrl" =INFO REPORT==== 6-Dec-2016::10:28:35 === Writing beam file to "riak_yokozuna_pb.beam" Compiling src/riak_search.proto =INFO REPORT==== 6-Dec-2016::10:28:36 === Writing header file to "riak_search_pb.hrl" =INFO REPORT==== 6-Dec-2016::10:28:36 === Writing beam file to "riak_search_pb.beam" Compiling src/riak.proto =INFO REPORT==== 6-Dec-2016::10:28:36 === Writing header file to "riak_pb.hrl" =INFO REPORT==== 6-Dec-2016::10:28:36 === Writing beam file to "riak_pb.beam" Compiling src/riak_ts.proto =INFO REPORT==== 6-Dec-2016::10:28:36 === Writing header file to "riak_ts_pb.hrl" =INFO REPORT==== 6-Dec-2016::10:28:36 === Writing beam file to "riak_ts_pb.beam" Compiled src/riak_pb_kv_codec.erl Compiled src/riak_pb_codec.erl Compiled src/riak_pb_search_codec.erl Compiled src/riak_pb_messages.erl Compiled src/riak_ttb_codec.erl Compiled src/riak_pb_ts_codec.erl Compiled src/riak_pb_dt_codec.erl ``` --------------------------------------------------
:white_check_mark: MAKE_TEST

> Started at: 2016-12-06 10:28 > Duration: 9 seconds. > Result: OK > Message: OK > Exit Code: 0 > :page_facing_up:

``` cd /tmp/thumbs/develop.cb15cc4.sweeper-develop-merge.f51ded9; make test ==> meck (pre_compile) ==> meck (compile) ==> protobuffs (pre_compile) ==> protobuffs (compile) ==> hamcrest (pre_compile) ==> hamcrest (compile) ==> hamcrest (post_compile) ==> develop.cb15cc4.sweeper-develop-merge.f51ded9 (pre_compile) ==> develop.cb15cc4.sweeper-develop-merge.f51ded9 (compile) ./rebar eunit skip_deps=true ==> develop.cb15cc4.sweeper-develop-merge.f51ded9 (eunit) Compiled src/riak_pb_kv_codec.erl Compiled src/riak_pb_codec.erl Compiled src/riak_pb_dt_codec.erl Compiled src/riak_ttb_codec.erl Compiled src/riak_pb_search_codec.erl Compiled src/riak_pb_messages.erl Compiled test/encoding_test.erl Compiled src/riak_pb_ts_codec.erl Compiled test/riak_pb_dt_codec_tests.erl Compiled test/bucket_props_codec_eqc.erl ======================== EUnit ======================== riak_pb_kv_codec: encode_apl_ann_test (module 'riak_pb_kv_codec')...[0.002 s] ok module 'riak_ttb_codec' module 'riak_pb_codec' riak_pb_codec: record_test...[0.029 s] ok riak_pb_codec: optional_booleans_test...[0.023 s] ok riak_pb_codec: empty_atoms_test...ok riak_pb_codec: mixed_strings_test...ok [done in 0.064 s] module 'riak_pb_messages' module 'riak_pb_ts_codec' riak_pb_ts_codec: encode_cells_test...ok riak_pb_ts_codec: encode_row_test...ok riak_pb_ts_codec: encode_rows_test...ok riak_pb_ts_codec: encode_field_type_test...ok riak_pb_ts_codec: decode_cell_test...ok riak_pb_ts_codec: decode_cells_test...ok riak_pb_ts_codec: decode_rows_test...ok [done in 0.021 s] module 'riak_pb_dt_codec' module 'riak_pb_dt_codec_tests' riak_pb_dt_codec_tests: operation_type_gset_test...ok riak_pb_dt_codec_tests: decode_operation_gset_test...ok riak_pb_dt_codec_tests: decode_fetch_response_gset_test...ok riak_pb_dt_codec_tests: decode_update_response_test...ok riak_pb_dt_codec_tests: encode_fetch_response_gset_test...ok riak_pb_dt_codec_tests: encode_update_request_gset_test...ok [done in 0.018 s] [done in 0.018 s] module 'encoding_test' encoding_test:9: pb_test_ (content encode decode)...ok encoding_test:35: pb_test_ (deleted header encode decode)...ok encoding_test:53: pb_test_ (indexes encode decode)...ok encoding_test:66: pb_test_ (empty content encode decode)...ok encoding_test:77: pb_test_ (empty repeated metas are removed/ignored)...ok encoding_test:88: pb_test_ (riak_dt-dtfetchreq-encode-decode)...ok encoding_test:104: pb_test_ (msg code encode decode)...ok [done in 0.021 s] module 'riak_pb_search_codec' bucket_props_codec_eqc:36: bucket_codec_test_ (module 'bucket_props_codec_eqc').......................................................................................................(x10)....................................................................................................(x100)........................................................................(x10)......(x1)...... Time limit reached: 4.0 seconds. OK, passed 8366 tests [4.958 s] ok ======================================================= All 26 tests passed. =INFO REPORT==== 6-Dec-2016::10:28:46 === application: inets exited: killed type: temporary ``` --------------------------------------------------
:white_check_mark: MAKE_XREF

> Started at: 2016-12-06 10:28 > Duration: 2 seconds. > Result: OK > Message: OK > Exit Code: 0 > :page_facing_up:

``` cd /tmp/thumbs/develop.cb15cc4.sweeper-develop-merge.f51ded9; make xref ==> meck (pre_compile) ==> meck (compile) ==> protobuffs (pre_compile) ==> protobuffs (compile) ==> hamcrest (pre_compile) ==> hamcrest (compile) ==> hamcrest (post_compile) ==> develop.cb15cc4.sweeper-develop-merge.f51ded9 (pre_compile) ==> develop.cb15cc4.sweeper-develop-merge.f51ded9 (compile) ./rebar xref skip_deps=true ==> develop.cb15cc4.sweeper-develop-merge.f51ded9 (xref) ``` --------------------------------------------------
:white_check_mark: MAKE_DIALYZER

> Started at: 2016-12-06 10:28 > Duration: 97 seconds. > Result: OK > Message: OK > Exit Code: 0 > :page_facing_up:

``` cd /tmp/thumbs/develop.cb15cc4.sweeper-develop-merge.f51ded9; make dialyzer ==> meck (pre_compile) ==> meck (compile) ==> protobuffs (pre_compile) ==> protobuffs (compile) ==> hamcrest (pre_compile) ==> hamcrest (compile) ==> hamcrest (post_compile) ==> develop.cb15cc4.sweeper-develop-merge.f51ded9 (pre_compile) ==> develop.cb15cc4.sweeper-develop-merge.f51ded9 (compile) Checking whether the PLT /home/ubuntu/.combo_dialyzer_plt is up-to-date... yes done (passed successfully) Compiling some key modules to native code... done in 0m8.53s Adding information to /home/ubuntu/.combo_dialyzer_plt... eunit_test.erl:305: Call to missing or unexported function eunit_test:nonexisting_function/0 Unknown functions: asn1rt_nif:decode_ber_tlv/1 asn1rt_nif:encode_ber_tlv/1 edoc:get_doc/2 edoc:layout/2 gs:button/3 gs:config/2 gs:destroy/1 gs:editor/3 gs:label/3 gs:listbox/3 gs:menu/3 gs:menubar/3 gs:menubutton/3 gs:menuitem/2 gs:start/0 gs:window/3 otp_mib:erl_node_table/3 ttb:ctp/2 ttb:p/2 ttb:stop/1 ttb:tp/2 ttb:tpl/2 ttb:tpl/3 ttb:tpl/4 ttb:tracer/2 done in 1m5.84s done (warnings were emitted) Compiling some key modules to native code... done in 0m8.60s Creating PLT .local_dialyzer_plt ... Unknown functions: application:get_env/2 beam_lib:chunks/2 code:delete/1 code:ensure_loaded/1 code:get_object_code/1 code:is_sticky/1 code:load_binary/3 code:purge/1 code:stick_mod/1 code:unstick_mod/1 compile:forms/2 cover:compile_beam/1 cover:compile_beam/2 cover:compile_module/2 cover:export/2 cover:get_term/1 cover:import/1 cover:is_compiled/1 cover:module_info/1 cover:write/2 dict:erase/2 dict:fetch/2 dict:find/2 dict:fold/3 dict:from_list/1 dict:is_key/2 dict:new/0 dict:size/1 dict:store/3 dict:to_list/1 erl_parse:abstract/1 erl_parse:parse_exprs/1 erl_prettypr:format/1 erl_scan:reserved_word/1 erl_scan:string/1 erl_scan:token_info/2 erl_syntax:form_list/1 erlang:atom_to_list/1 erlang:binary_to_list/1 erlang:erase/1 erlang:fun_info/2 erlang:get/1 erlang:get_module_info/1 erlang:get_module_info/2 erlang:get_stacktrace/0 erlang:integer_to_list/1 erlang:iolist_size/1 erlang:is_builtin/3 erlang:is_process_alive/1 erlang:link/1 erlang:list_to_atom/1 erlang:list_to_existing_atom/1 erlang:list_to_float/1 erlang:list_to_integer/1 erlang:list_to_tuple/1 erlang:make_fun/3 erlang:monitor/2 erlang:process_flag/2 erlang:put/2 erlang:raise/3 erlang:registered/0 erlang:split_binary/2 error_logger:error_report/1 error_logger:info_msg/2 error_logger:warning_report/1 escript:script_name/0 ets:match_spec_compile/1 ets:match_spec_run/2 file:close/1 file:delete/1 file:open/2 file:path_open/3 file:write_file/2 filename:basename/1 filename:basename/2 filename:extension/1 filename:join/2 gb_sets:is_element/2 gb_sets:is_empty/1 gb_sets:is_set/1 gen_server:call/2 gen_server:call/3 gen_server:reply/2 gen_server:start/4 io:format/2 io:format/3 io:request/2 io_lib:deep_char_list/1 io_lib:format/2 io_lib:fread/2 io_lib:write/1 io_lib:write_char/1 io_lib:write_string/1 lists:duplicate/2 lists:keytake/3 lists:seq/2 lists:sublist/2 lists:sublist/3 ordsets:is_element/2 ordsets:is_set/1 ordsets:size/1 os:timestamp/0 proplists:get_bool/2 proplists:get_value/2 proplists:get_value/3 proplists:is_defined/2 re:replace/4 re:run/2 re:split/2 sets:is_element/2 sets:is_set/1 sets:size/1 string:equal/2 string:join/2 string:right/2 string:str/2 string:to_lower/1 string:to_upper/1 string:tokens/2 unicode:characters_to_binary/1 Unknown types: erlang:timestamp/0 ets:comp_match_spec/0 meck_history:history_record/0 proplists:property/0 done in 0m1.05s done (passed successfully) ==> develop.cb15cc4.sweeper-develop-merge.f51ded9 (dialyzer) ``` --------------------------------------------------
:white_large_square: 0 of 2 Code reviews from organization basho
thumbot commented 7 years ago
sweeper-develop-merge f51ded9 :arrow_right: develop adc603b :no_entry: completed
There seems to be an issue with build step **merge,make_compile,make_test,make_xref,make_dialyzer** ! :cloud:
:no_entry: MERGE

> Started at: 2016-12-08 09:03 > Duration: seconds. > Result: ERROR > Message: Merge Failed: sweeper-develop-merge f51ded91492d1951f10bae510b903b62962875b3 onto target branch: develop adc603b36cfbb75aa09e302d5aa33859f0d24ad2 > Exit Code: ERROR > :page_facing_up:

``` #&1:error: Your local changes to the following files would be overwritten by merge: dialyzer.ignore-warnings include/riak_pb_kv_codec.hrl src/riak.proto src/riak_kv.proto src/riak_pb_codec.erl src/riak_pb_kv_codec.erl Please, commit your changes or stash them before you can merge. Aborting> ``` --------------------------------------------------
:white_check_mark: MAKE_CLEAN

> Started at: 2016-12-08 09:03 > Duration: 1 seconds. > Result: OK > Message: OK > Exit Code: 0 > :page_facing_up:

``` cd /tmp/thumbs/develop.adc603b.sweeper-develop-merge.f51ded9; make clean ==> develop.adc603b.sweeper-develop-merge.f51ded9 (clean) ``` --------------------------------------------------
:white_check_mark: MAKE_DEPS

> Started at: 2016-12-08 09:03 > Duration: 2 seconds. > Result: OK > Message: OK > Exit Code: 0 > :page_facing_up:

``` cd /tmp/thumbs/develop.adc603b.sweeper-develop-merge.f51ded9; make deps ==> develop.adc603b.sweeper-develop-merge.f51ded9 (get-deps) Pulling hamcrest from {git,"https://github.com/basho/hamcrest-erlang.git", {tag,"0.3.0-basho"}} Cloning into 'hamcrest'... ==> hamcrest (get-deps) ``` --------------------------------------------------
:no_entry: MAKE_COMPILE

> Started at: 2016-12-08 09:03 > Duration: 2 seconds. > Result: ERROR > Message: Step make_compile Failed! > Exit Code: 2 > :page_facing_up:

``` cd /tmp/thumbs/develop.adc603b.sweeper-develop-merge.f51ded9; make compile ==> hamcrest (compile) Compiled src/hamcrest.erl Compiled src/hamcrest_term.erl Compiled src/hamcrest_matchers.erl ==> hamcrest (post_compile) ==> develop.adc603b.sweeper-develop-merge.f51ded9 (compile) include/riak_pb_kv_codec.hrl:33: syntax error before: '<<' include/riak_pb_kv_codec.hrl:36: syntax error before: '>>' src/riak_pb_kv_codec.erl:90: undefined macro 'CTYPE_ERLANG_BINARY' src/riak_pb_kv_codec.erl:123: undefined macro 'MD_TTL' src/riak_pb_kv_codec.erl:188: undefined macro 'MD_TTL' src/riak_pb_kv_codec.erl:37: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:37: function encode_content/1 undefined src/riak_pb_kv_codec.erl:37: function encode_content_meta/3 undefined src/riak_pb_kv_codec.erl:74: function encode_content/1 undefined src/riak_pb_kv_codec.erl:77: spec for undefined function riak_pb_kv_codec:encode_content/1 src/riak_pb_kv_codec.erl:96: spec for undefined function riak_pb_kv_codec:encode_content_meta/3 src/riak_pb_kv_codec.erl:148: spec for undefined function riak_pb_kv_codec:decode_content_meta/3 src/riak_pb_kv_codec.erl:193: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:194: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:195: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:196: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:197: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:198: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:199: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:200: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:201: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:202: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:202: field ttl undefined in record rpbcontent src/riak_pb_kv_codec.erl:134: function header_val_to_bool/1 is unused Compiling src/riak_pb_kv_codec.erl failed: ERROR: compile failed while processing /tmp/thumbs/develop.adc603b.sweeper-develop-merge.f51ded9: rebar_abort make: *** [erl_compile] Error 1 ``` --------------------------------------------------
:no_entry: MAKE_TEST

> Started at: 2016-12-08 09:03 > Duration: 1 seconds. > Result: ERROR > Message: Step make_test Failed! > Exit Code: 2 > :page_facing_up:

``` cd /tmp/thumbs/develop.adc603b.sweeper-develop-merge.f51ded9; make test ==> hamcrest (compile) ==> hamcrest (post_compile) ==> develop.adc603b.sweeper-develop-merge.f51ded9 (compile) include/riak_pb_kv_codec.hrl:33: syntax error before: '<<' include/riak_pb_kv_codec.hrl:36: syntax error before: '>>' src/riak_pb_kv_codec.erl:90: undefined macro 'CTYPE_ERLANG_BINARY' src/riak_pb_kv_codec.erl:123: undefined macro 'MD_TTL' src/riak_pb_kv_codec.erl:188: undefined macro 'MD_TTL' src/riak_pb_kv_codec.erl:37: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:37: function encode_content/1 undefined src/riak_pb_kv_codec.erl:37: function encode_content_meta/3 undefined src/riak_pb_kv_codec.erl:74: function encode_content/1 undefined src/riak_pb_kv_codec.erl:77: spec for undefined function riak_pb_kv_codec:encode_content/1 src/riak_pb_kv_codec.erl:96: spec for undefined function riak_pb_kv_codec:encode_content_meta/3 src/riak_pb_kv_codec.erl:148: spec for undefined function riak_pb_kv_codec:decode_content_meta/3 src/riak_pb_kv_codec.erl:193: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:194: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:195: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:196: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:197: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:198: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:199: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:200: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:201: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:202: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:202: field ttl undefined in record rpbcontent src/riak_pb_kv_codec.erl:134: function header_val_to_bool/1 is unused Compiling src/riak_pb_kv_codec.erl failed: ERROR: compile failed while processing /tmp/thumbs/develop.adc603b.sweeper-develop-merge.f51ded9: rebar_abort make: *** [erl_compile] Error 1 ``` --------------------------------------------------
:no_entry: MAKE_XREF

> Started at: 2016-12-08 09:03 > Duration: 1 seconds. > Result: ERROR > Message: Step make_xref Failed! > Exit Code: 2 > :page_facing_up:

``` cd /tmp/thumbs/develop.adc603b.sweeper-develop-merge.f51ded9; make xref ==> hamcrest (compile) ==> hamcrest (post_compile) ==> develop.adc603b.sweeper-develop-merge.f51ded9 (compile) include/riak_pb_kv_codec.hrl:33: syntax error before: '<<' include/riak_pb_kv_codec.hrl:36: syntax error before: '>>' src/riak_pb_kv_codec.erl:90: undefined macro 'CTYPE_ERLANG_BINARY' src/riak_pb_kv_codec.erl:123: undefined macro 'MD_TTL' src/riak_pb_kv_codec.erl:188: undefined macro 'MD_TTL' src/riak_pb_kv_codec.erl:37: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:37: function encode_content/1 undefined src/riak_pb_kv_codec.erl:37: function encode_content_meta/3 undefined src/riak_pb_kv_codec.erl:74: function encode_content/1 undefined src/riak_pb_kv_codec.erl:77: spec for undefined function riak_pb_kv_codec:encode_content/1 src/riak_pb_kv_codec.erl:96: spec for undefined function riak_pb_kv_codec:encode_content_meta/3 src/riak_pb_kv_codec.erl:148: spec for undefined function riak_pb_kv_codec:decode_content_meta/3 src/riak_pb_kv_codec.erl:193: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:194: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:195: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:196: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:197: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:198: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:199: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:200: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:201: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:202: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:202: field ttl undefined in record rpbcontent src/riak_pb_kv_codec.erl:134: function header_val_to_bool/1 is unused Compiling src/riak_pb_kv_codec.erl failed: ERROR: compile failed while processing /tmp/thumbs/develop.adc603b.sweeper-develop-merge.f51ded9: rebar_abort make: *** [erl_compile] Error 1 ``` --------------------------------------------------
:no_entry: MAKE_DIALYZER

> Started at: 2016-12-08 09:03 > Duration: 1 seconds. > Result: ERROR > Message: Step make_dialyzer Failed! > Exit Code: 2 > :page_facing_up:

``` cd /tmp/thumbs/develop.adc603b.sweeper-develop-merge.f51ded9; make dialyzer ==> hamcrest (compile) ==> hamcrest (post_compile) ==> develop.adc603b.sweeper-develop-merge.f51ded9 (compile) include/riak_pb_kv_codec.hrl:33: syntax error before: '<<' include/riak_pb_kv_codec.hrl:36: syntax error before: '>>' src/riak_pb_kv_codec.erl:90: undefined macro 'CTYPE_ERLANG_BINARY' src/riak_pb_kv_codec.erl:123: undefined macro 'MD_TTL' src/riak_pb_kv_codec.erl:188: undefined macro 'MD_TTL' src/riak_pb_kv_codec.erl:37: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:37: function encode_content/1 undefined src/riak_pb_kv_codec.erl:37: function encode_content_meta/3 undefined src/riak_pb_kv_codec.erl:74: function encode_content/1 undefined src/riak_pb_kv_codec.erl:77: spec for undefined function riak_pb_kv_codec:encode_content/1 src/riak_pb_kv_codec.erl:96: spec for undefined function riak_pb_kv_codec:encode_content_meta/3 src/riak_pb_kv_codec.erl:148: spec for undefined function riak_pb_kv_codec:decode_content_meta/3 src/riak_pb_kv_codec.erl:193: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:194: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:195: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:196: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:197: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:198: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:199: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:200: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:201: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:202: function decode_content_meta/3 undefined src/riak_pb_kv_codec.erl:202: field ttl undefined in record rpbcontent src/riak_pb_kv_codec.erl:134: function header_val_to_bool/1 is unused Compiling src/riak_pb_kv_codec.erl failed: ERROR: compile failed while processing /tmp/thumbs/develop.adc603b.sweeper-develop-merge.f51ded9: rebar_abort make: *** [erl_compile] Error 1 ``` --------------------------------------------------
:white_large_square: 0 of 2 Code reviews from organization basho
thumbot commented 7 years ago
sweeper-develop-merge 7c63a5c :arrow_right: develop a3edea9 :white_check_mark: completed
Looks good! :+1:
:white_check_mark: MERGE

> Started at: 2016-12-22 09:19 > Duration: 0 seconds. > Result: OK > Message: Merge Success: sweeper-develop-merge 7c63a5c6ba5a7b5260dbd2b7772466cf77285289 onto target branch: develop a3edea948719aeb3d3366247140556c0adddce76 > Exit Code: OK > :page_facing_up:

``` Updating a3edea9..7c63a5c Fast-forward (no commit created; -m option ignored) include/riak_kv_pb.hrl | 6 +- include/riak_pb.hrl | 3 +- include/riak_pb_kv_codec.hrl | 1 + include/riak_search_pb.hrl | 3 +- include/riak_ts_pb.hrl | 7 +- src/riak.proto | 3 + src/riak_kv.proto | 1 + src/riak_kv_pb.erl | 834 +++++++++++++++++++++++++------------------ src/riak_pb.erl | 551 +++++++++++++++------------- src/riak_pb_codec.erl | 5 +- src/riak_pb_kv_codec.erl | 27 +- src/riak_search_pb.erl | 551 +++++++++++++++------------- src/riak_ts_pb.erl | 591 ++++++++++++++++-------------- 13 files changed, 1476 insertions(+), 1107 deletions(-) ``` --------------------------------------------------
:white_check_mark: MAKE_CLEAN

> Started at: 2016-12-22 09:19 > Duration: 0 seconds. > Result: OK > Message: OK > Exit Code: 0 > :page_facing_up:

``` cd /tmp/thumbs/develop.a3edea9.sweeper-develop-merge.7c63a5c; make clean ==> develop.a3edea9.sweeper-develop-merge.7c63a5c (clean) ``` --------------------------------------------------
:white_check_mark: MAKE_DEPS

> Started at: 2016-12-22 09:19 > Duration: 2 seconds. > Result: OK > Message: OK > Exit Code: 0 > :page_facing_up:

``` cd /tmp/thumbs/develop.a3edea9.sweeper-develop-merge.7c63a5c; make deps ==> develop.a3edea9.sweeper-develop-merge.7c63a5c (get-deps) Pulling hamcrest from {git,"https://github.com/basho/hamcrest-erlang.git", {tag,"0.3.0-basho"}} Cloning into 'hamcrest'... ==> hamcrest (get-deps) ``` --------------------------------------------------
:white_check_mark: MAKE_COMPILE

> Started at: 2016-12-22 09:19 > Duration: 5 seconds. > Result: OK > Message: OK > Exit Code: 0 > :page_facing_up:

``` cd /tmp/thumbs/develop.a3edea9.sweeper-develop-merge.7c63a5c; make compile ==> hamcrest (compile) Compiled src/hamcrest.erl Compiled src/hamcrest_term.erl Compiled src/hamcrest_matchers.erl ==> hamcrest (post_compile) ==> develop.a3edea9.sweeper-develop-merge.7c63a5c (compile) Compiled src/riak_pb_kv_codec.erl Compiled src/riak_pb_codec.erl Compiled src/riak_pb_search_codec.erl Compiled src/riak_pb_messages.erl Compiled src/riak_pb_dt_codec.erl Compiled src/riak_dt_pb.erl Compiled src/riak_pb.erl Compiled src/riak_ttb_codec.erl Compiled src/riak_yokozuna_pb.erl Compiled src/riak_pb_ts_codec.erl Compiled src/riak_ts_pb.erl Compiled src/riak_search_pb.erl Compiled src/riak_kv_pb.erl ``` --------------------------------------------------
:white_check_mark: MAKE_TEST

> Started at: 2016-12-22 09:19 > Duration: 13 seconds. > Result: OK > Message: OK > Exit Code: 0 > :page_facing_up:

``` cd /tmp/thumbs/develop.a3edea9.sweeper-develop-merge.7c63a5c; make test ==> hamcrest (compile) ==> hamcrest (post_compile) ==> develop.a3edea9.sweeper-develop-merge.7c63a5c (compile) ./rebar eunit skip_deps=true ==> develop.a3edea9.sweeper-develop-merge.7c63a5c (eunit) Compiled src/riak_pb_kv_codec.erl Compiled src/riak_pb_codec.erl Compiled src/riak_pb_dt_codec.erl Compiled src/riak_pb_search_codec.erl Compiled src/riak_pb_messages.erl Compiled src/riak_pb.erl Compiled src/riak_dt_pb.erl Compiled src/riak_ttb_codec.erl Compiled src/riak_yokozuna_pb.erl Compiled src/riak_pb_ts_codec.erl Compiled src/riak_ts_pb.erl Compiled src/riak_search_pb.erl Compiled test/encoding_test.erl Compiled test/riak_pb_dt_codec_tests.erl Compiled src/riak_kv_pb.erl Compiled test/bucket_props_codec_eqc.erl ======================== EUnit ======================== riak_pb_kv_codec: encode_apl_ann_test (module 'riak_pb_kv_codec')...[0.001 s] ok module 'riak_ttb_codec' module 'riak_pb_codec' riak_pb_codec: record_test...[0.010 s] ok riak_pb_codec: optional_booleans_test...[0.004 s] ok riak_pb_codec: empty_atoms_test...ok riak_pb_codec: mixed_strings_test...ok [done in 0.026 s] module 'riak_pb_messages' module 'riak_dt_pb' module 'riak_pb' module 'riak_pb_ts_codec' riak_pb_ts_codec: encode_cells_test...ok riak_pb_ts_codec: encode_row_test...ok riak_pb_ts_codec: encode_rows_test...ok riak_pb_ts_codec: encode_field_type_test...ok riak_pb_ts_codec: decode_cell_test...ok riak_pb_ts_codec: decode_cells_test...ok riak_pb_ts_codec: decode_rows_test...ok [done in 0.021 s] module 'riak_search_pb' module 'riak_ts_pb' module 'riak_pb_dt_codec' module 'riak_pb_dt_codec_tests' riak_pb_dt_codec_tests: operation_type_gset_test...ok riak_pb_dt_codec_tests: decode_operation_gset_test...ok riak_pb_dt_codec_tests: decode_fetch_response_gset_test...ok riak_pb_dt_codec_tests: decode_update_response_test...ok riak_pb_dt_codec_tests: encode_fetch_response_gset_test...ok riak_pb_dt_codec_tests: encode_update_request_gset_test...ok [done in 0.018 s] [done in 0.018 s] module 'riak_kv_pb' module 'encoding_test' encoding_test:9: pb_test_ (content encode decode)...ok encoding_test:39: pb_test_ (deleted header encode decode)...ok encoding_test:59: pb_test_ (indexes encode decode)...ok encoding_test:73: pb_test_ (empty content encode decode)...ok encoding_test:85: pb_test_ (empty repeated metas are removed/ignored)...ok encoding_test:97: pb_test_ (riak_dt-dtfetchreq-encode-decode)...ok encoding_test:113: pb_test_ (msg code encode decode)...ok [done in 0.021 s] module 'riak_pb_search_codec' bucket_props_codec_eqc:36: bucket_codec_test_ (module 'bucket_props_codec_eqc').......................................................................................................(x10)....................................................................................................(x100)...............................................................................(x10)......(x1)........ Time limit reached: 4.0 seconds. OK, passed 9068 tests [5.552 s] ok module 'riak_yokozuna_pb' ======================================================= All 26 tests passed. =INFO REPORT==== 22-Dec-2016::09:19:47 === application: inets exited: killed type: temporary ``` --------------------------------------------------
:white_check_mark: MAKE_XREF

> Started at: 2016-12-22 09:19 > Duration: 2 seconds. > Result: OK > Message: OK > Exit Code: 0 > :page_facing_up:

``` cd /tmp/thumbs/develop.a3edea9.sweeper-develop-merge.7c63a5c; make xref ==> hamcrest (compile) ==> hamcrest (post_compile) ==> develop.a3edea9.sweeper-develop-merge.7c63a5c (compile) ./rebar xref skip_deps=true ==> develop.a3edea9.sweeper-develop-merge.7c63a5c (xref) ``` --------------------------------------------------
:white_check_mark: MAKE_DIALYZER

> Started at: 2016-12-22 09:19 > Duration: 128 seconds. > Result: OK > Message: OK > Exit Code: 0 > :page_facing_up:

``` cd /tmp/thumbs/develop.a3edea9.sweeper-develop-merge.7c63a5c; make dialyzer ==> hamcrest (compile) ==> hamcrest (post_compile) ==> develop.a3edea9.sweeper-develop-merge.7c63a5c (compile) Checking whether the PLT /home/ubuntu/.combo_dialyzer_plt is up-to-date... yes done (passed successfully) yes done (passed successfully) Creating PLT .local_dialyzer_plt ... Unknown functions: application:get_env/2 erlang:get_module_info/1 erlang:get_module_info/2 erlang:is_process_alive/1 gb_sets:is_element/2 gb_sets:is_empty/1 gb_sets:is_set/1 ordsets:is_element/2 ordsets:is_set/1 ordsets:size/1 re:run/2 sets:is_element/2 sets:is_set/1 sets:size/1 string:equal/2 string:right/2 string:str/2 done in 0m0.23s done (passed successfully) ==> develop.a3edea9.sweeper-develop-merge.7c63a5c (dialyzer) ``` --------------------------------------------------
:white_large_square: 0 of 2 Code reviews from organization basho
nickelization commented 7 years ago

Thanks for the review, @ian-mi!

He and I discussed this over Slack a bit, but I just wanted to post here to keep the process transparent to anyone looking at this PR. We decided against squashing any of Mikael's commits since he's not working with us anymore and I'd rather not rebase somebody else's commits. We're also keeping the merge commits (rather than rebase them away) since they contain conflict resolutions.

davidx commented 7 years ago

@nickelization If using @thumbot to perform the final merge, please note that you can set the merge_method: merge to ensure a merge commit vs squash, rebase. default being 'squash'

https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button

thumbot commented 7 years ago
sweeper-develop-merge 6156ab3 :arrow_right: develop a3edea9 :white_check_mark: completed
Looks good! :+1:
:white_check_mark: MERGE

> Started at: 2017-01-04 12:18 > Duration: 2 seconds. > Result: OK > Message: Merge Success: sweeper-develop-merge 6156ab31292abb44fc98169bd2806f1cce1d3a35 onto target branch: develop a3edea948719aeb3d3366247140556c0adddce76 > Exit Code: OK > :page_facing_up:

``` Updating a3edea9..6156ab3 Fast-forward (no commit created; -m option ignored) include/riak_kv_pb.hrl | 6 +- include/riak_pb.hrl | 3 +- include/riak_pb_kv_codec.hrl | 1 + include/riak_search_pb.hrl | 3 +- include/riak_ts_pb.hrl | 7 +- src/riak.proto | 3 + src/riak_kv.proto | 1 + src/riak_kv_pb.erl | 834 +++++++++++++++++++++++++------------------ src/riak_pb.erl | 551 +++++++++++++++------------- src/riak_pb_codec.erl | 5 +- src/riak_pb_kv_codec.erl | 27 +- src/riak_search_pb.erl | 551 +++++++++++++++------------- src/riak_ts_pb.erl | 591 ++++++++++++++++-------------- 13 files changed, 1476 insertions(+), 1107 deletions(-) ``` --------------------------------------------------
:white_check_mark: MAKE_CLEAN

> Started at: 2017-01-04 12:18 > Duration: 1 seconds. > Result: OK > Message: OK > Exit Code: 0 > :page_facing_up:

``` cd /tmp/thumbs/develop.a3edea9.sweeper-develop-merge.6156ab3; make clean ==> develop.a3edea9.sweeper-develop-merge.6156ab3 (clean) ``` --------------------------------------------------
:white_check_mark: MAKE_DEPS

> Started at: 2017-01-04 12:18 > Duration: 2 seconds. > Result: OK > Message: OK > Exit Code: 0 > :page_facing_up:

``` cd /tmp/thumbs/develop.a3edea9.sweeper-develop-merge.6156ab3; make deps ==> develop.a3edea9.sweeper-develop-merge.6156ab3 (get-deps) Pulling hamcrest from {git,"https://github.com/basho/hamcrest-erlang.git", {tag,"0.3.0-basho"}} Cloning into 'hamcrest'... ==> hamcrest (get-deps) ``` --------------------------------------------------
:white_check_mark: MAKE_COMPILE

> Started at: 2017-01-04 12:18 > Duration: 5 seconds. > Result: OK > Message: OK > Exit Code: 0 > :page_facing_up:

``` cd /tmp/thumbs/develop.a3edea9.sweeper-develop-merge.6156ab3; make compile ==> hamcrest (compile) Compiled src/hamcrest.erl Compiled src/hamcrest_term.erl Compiled src/hamcrest_matchers.erl ==> hamcrest (post_compile) ==> develop.a3edea9.sweeper-develop-merge.6156ab3 (compile) Compiled src/riak_pb_kv_codec.erl Compiled src/riak_pb_codec.erl Compiled src/riak_pb_search_codec.erl Compiled src/riak_pb_messages.erl Compiled src/riak_pb_dt_codec.erl Compiled src/riak_dt_pb.erl Compiled src/riak_pb.erl Compiled src/riak_ttb_codec.erl Compiled src/riak_yokozuna_pb.erl Compiled src/riak_pb_ts_codec.erl Compiled src/riak_ts_pb.erl Compiled src/riak_search_pb.erl Compiled src/riak_kv_pb.erl ``` --------------------------------------------------
:white_check_mark: MAKE_TEST

> Started at: 2017-01-04 12:18 > Duration: 12 seconds. > Result: OK > Message: OK > Exit Code: 0 > :page_facing_up:

``` cd /tmp/thumbs/develop.a3edea9.sweeper-develop-merge.6156ab3; make test ==> hamcrest (compile) ==> hamcrest (post_compile) ==> develop.a3edea9.sweeper-develop-merge.6156ab3 (compile) ./rebar eunit skip_deps=true ==> develop.a3edea9.sweeper-develop-merge.6156ab3 (eunit) Compiled src/riak_pb_kv_codec.erl Compiled src/riak_pb_codec.erl Compiled src/riak_pb_dt_codec.erl Compiled src/riak_pb_search_codec.erl Compiled src/riak_pb_messages.erl Compiled src/riak_pb.erl Compiled src/riak_dt_pb.erl Compiled src/riak_ttb_codec.erl Compiled src/riak_yokozuna_pb.erl Compiled src/riak_pb_ts_codec.erl Compiled src/riak_ts_pb.erl Compiled src/riak_search_pb.erl Compiled test/encoding_test.erl Compiled test/riak_pb_dt_codec_tests.erl Compiled src/riak_kv_pb.erl Compiled test/bucket_props_codec_eqc.erl ======================== EUnit ======================== riak_pb_kv_codec: encode_apl_ann_test (module 'riak_pb_kv_codec')...[0.002 s] ok module 'riak_ttb_codec' module 'riak_pb_codec' riak_pb_codec: record_test...[0.010 s] ok riak_pb_codec: optional_booleans_test...[0.004 s] ok riak_pb_codec: empty_atoms_test...ok riak_pb_codec: mixed_strings_test...ok [done in 0.026 s] module 'riak_pb_messages' module 'riak_dt_pb' module 'riak_pb' module 'riak_pb_ts_codec' riak_pb_ts_codec: encode_cells_test...ok riak_pb_ts_codec: encode_row_test...ok riak_pb_ts_codec: encode_rows_test...ok riak_pb_ts_codec: encode_field_type_test...ok riak_pb_ts_codec: decode_cell_test...ok riak_pb_ts_codec: decode_cells_test...ok riak_pb_ts_codec: decode_rows_test...ok [done in 0.021 s] module 'riak_search_pb' module 'riak_ts_pb' module 'riak_pb_dt_codec' module 'riak_pb_dt_codec_tests' riak_pb_dt_codec_tests: operation_type_gset_test...ok riak_pb_dt_codec_tests: decode_operation_gset_test...ok riak_pb_dt_codec_tests: decode_fetch_response_gset_test...ok riak_pb_dt_codec_tests: decode_update_response_test...ok riak_pb_dt_codec_tests: encode_fetch_response_gset_test...ok riak_pb_dt_codec_tests: encode_update_request_gset_test...ok [done in 0.018 s] [done in 0.018 s] module 'riak_kv_pb' module 'encoding_test' encoding_test:9: pb_test_ (content encode decode)...[0.001 s] ok encoding_test:39: pb_test_ (deleted header encode decode)...ok encoding_test:59: pb_test_ (indexes encode decode)...ok encoding_test:73: pb_test_ (empty content encode decode)...ok encoding_test:85: pb_test_ (empty repeated metas are removed/ignored)...ok encoding_test:97: pb_test_ (riak_dt-dtfetchreq-encode-decode)...ok encoding_test:113: pb_test_ (msg code encode decode)...ok [done in 0.022 s] module 'riak_pb_search_codec' bucket_props_codec_eqc:36: bucket_codec_test_ (module 'bucket_props_codec_eqc').......................................................................................................(x10)....................................................................................................(x100).................................................................................(x10)........(x1)..... Time limit reached: 4.0 seconds. OK, passed 9285 tests [5.595 s] ok module 'riak_yokozuna_pb' ======================================================= All 26 tests passed. =ERROR REPORT==== 4-Jan-2017::12:18:40 === ** Generic server tftp_sup terminating ** Last message in was {'EXIT',<0.299.0>,killed} ** When Server state == {state,{local,tftp_sup}, one_for_one,[],undefined,10,3600,[],tftp_sup, [[]]} ** Reason for termination == ** killed =INFO REPORT==== 4-Jan-2017::12:18:40 === application: inets exited: killed type: temporary ``` --------------------------------------------------
:white_check_mark: MAKE_XREF

> Started at: 2017-01-04 12:18 > Duration: 3 seconds. > Result: OK > Message: OK > Exit Code: 0 > :page_facing_up:

``` cd /tmp/thumbs/develop.a3edea9.sweeper-develop-merge.6156ab3; make xref ==> hamcrest (compile) ==> hamcrest (post_compile) ==> develop.a3edea9.sweeper-develop-merge.6156ab3 (compile) ./rebar xref skip_deps=true ==> develop.a3edea9.sweeper-develop-merge.6156ab3 (xref) ``` --------------------------------------------------
:white_check_mark: MAKE_DIALYZER

> Started at: 2017-01-04 12:18 > Duration: 121 seconds. > Result: OK > Message: OK > Exit Code: 0 > :page_facing_up:

``` cd /tmp/thumbs/develop.a3edea9.sweeper-develop-merge.6156ab3; make dialyzer ==> hamcrest (compile) ==> hamcrest (post_compile) ==> develop.a3edea9.sweeper-develop-merge.6156ab3 (compile) Checking whether the PLT /home/ubuntu/.combo_dialyzer_plt is up-to-date... yes done (passed successfully) yes done (passed successfully) Creating PLT .local_dialyzer_plt ... Unknown functions: application:get_env/2 erlang:get_module_info/1 erlang:get_module_info/2 erlang:is_process_alive/1 gb_sets:is_element/2 gb_sets:is_empty/1 gb_sets:is_set/1 ordsets:is_element/2 ordsets:is_set/1 ordsets:size/1 re:run/2 sets:is_element/2 sets:is_set/1 sets:size/1 string:equal/2 string:right/2 string:str/2 done in 0m0.23s done (passed successfully) ==> develop.a3edea9.sweeper-develop-merge.6156ab3 (dialyzer) ``` --------------------------------------------------
:white_large_square: 0 of 2 Code reviews from organization basho
ian-mi commented 7 years ago

+1

nickelization commented 7 years ago

As discussed with @davidx and @ian-mi, manually hitting the merge button to keep Thumbs from auto-squashing all the history here.