Fix compilation (#911)

Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
2025-04-26 13:48:53 +08:00 · 2019-10-26 17:46:23 +02:00 · 2019-10-26 17:46:23 +02:00 · 7499f8deea
commit 7499f8deea
parent 02fd492105
4 changed files with 118 additions and 104 deletions
--- a/mqtt/verne/README.md
+++ b/mqtt/verne/README.md
@ -75,7 +75,7 @@ Install [gpb](https://github.com/tomas-abrahamsson/gpb)
 ```
 git clone https://github.com/tomas-abrahamsson/gpb.git
 cd gpb
-git checkout 4.9.0
+git checkout 4.10.5
 make -j 16
 ```

--- a/mqtt/verne/rebar.config
+++ b/mqtt/verne/rebar.config
@ -2,7 +2,7 @@
 {deps, [
        {vernemq_dev, {git, "git://github.com/erlio/vernemq_dev.git", {branch, "master"}}},
        {teacup_nats, "0.4.1"},
-        {gpb, "4.9.0"},
+        {gpb, "4.10.5"},
        {grpc_client, {git, "https://github.com/galaxie/grpc_client", {branch, "fix/package_name_duplicates"}}},
        {poolboy, "1.5.2"},
        {eredis, "1.2.0"}
--- a/mqtt/verne/src/proto/internal.erl
+++ b/mqtt/verne/src/proto/internal.erl
@ -1,7 +1,7 @@
 %% -*- coding: utf-8 -*-
 %% @private
 %% Automatically generated, do not edit
-%% Generated by gpb_compile version 4.9.0
+%% Generated by gpb_compile version 4.10.5
 -module(internal).

 -export([encode_msg/2, encode_msg/3]).
@ -91,8 +91,9 @@ encode_msg(Msg, MsgName, Opts) ->
    TrUserData = proplists:get_value(user_data, Opts),
    case MsgName of
      'mainflux.AccessByKeyReq' ->
-	  'encode_msg_mainflux.AccessByKeyReq'(id(Msg, TrUserData),
-					  TrUserData);
+	  'encode_msg_mainflux.AccessByKeyReq'(id(Msg,
+						  TrUserData),
+					       TrUserData);
      'mainflux.ThingID' ->
 	  'encode_msg_mainflux.ThingID'(id(Msg, TrUserData),
 					TrUserData);
@ -112,11 +113,12 @@ encode_msg(Msg, MsgName, Opts) ->


 'encode_msg_mainflux.AccessByKeyReq'(Msg, TrUserData) ->
-    'encode_msg_mainflux.AccessByKeyReq'(Msg, <<>>, TrUserData).
+    'encode_msg_mainflux.AccessByKeyReq'(Msg, <<>>,
+					 TrUserData).


 'encode_msg_mainflux.AccessByKeyReq'(#{} = M, Bin,
-				TrUserData) ->
+				     TrUserData) ->
    B1 = case M of
 	   #{token := F1} ->
 	       begin
@ -368,7 +370,8 @@ decode_msg_1_catch(Bin, MsgName, TrUserData) ->

 decode_msg_2_doit('mainflux.AccessByKeyReq', Bin,
 		  TrUserData) ->
-    id('decode_msg_mainflux.AccessByKeyReq'(Bin, TrUserData),
+    id('decode_msg_mainflux.AccessByKeyReq'(Bin,
+					    TrUserData),
       TrUserData);
 decode_msg_2_doit('mainflux.ThingID', Bin,
 		  TrUserData) ->
@ -393,78 +396,80 @@ decode_msg_2_doit('google.protobuf.Empty', Bin,

 'decode_msg_mainflux.AccessByKeyReq'(Bin, TrUserData) ->
    'dfp_read_field_def_mainflux.AccessByKeyReq'(Bin, 0, 0,
-					    id([], TrUserData),
-					    id([], TrUserData), TrUserData).
+						 id([], TrUserData),
+						 id([], TrUserData),
+						 TrUserData).

 'dfp_read_field_def_mainflux.AccessByKeyReq'(<<10,
-					  Rest/binary>>,
-					Z1, Z2, F@_1, F@_2, TrUserData) ->
-    'd_field_mainflux.AccessByKeyReq_token'(Rest, Z1, Z2, F@_1,
-				       F@_2, TrUserData);
+					       Rest/binary>>,
+					     Z1, Z2, F@_1, F@_2, TrUserData) ->
+    'd_field_mainflux.AccessByKeyReq_token'(Rest, Z1, Z2,
+					    F@_1, F@_2, TrUserData);
 'dfp_read_field_def_mainflux.AccessByKeyReq'(<<18,
-					  Rest/binary>>,
-					Z1, Z2, F@_1, F@_2, TrUserData) ->
-    'd_field_mainflux.AccessByKeyReq_chanID'(Rest, Z1, Z2, F@_1,
-					F@_2, TrUserData);
+					       Rest/binary>>,
+					     Z1, Z2, F@_1, F@_2, TrUserData) ->
+    'd_field_mainflux.AccessByKeyReq_chanID'(Rest, Z1, Z2,
+					     F@_1, F@_2, TrUserData);
 'dfp_read_field_def_mainflux.AccessByKeyReq'(<<>>, 0, 0,
-					F@_1, F@_2, _) ->
+					     F@_1, F@_2, _) ->
    #{token => F@_1, chanID => F@_2};
-'dfp_read_field_def_mainflux.AccessByKeyReq'(Other, Z1, Z2,
-					F@_1, F@_2, TrUserData) ->
-    'dg_read_field_def_mainflux.AccessByKeyReq'(Other, Z1, Z2,
-					   F@_1, F@_2, TrUserData).
+'dfp_read_field_def_mainflux.AccessByKeyReq'(Other, Z1,
+					     Z2, F@_1, F@_2, TrUserData) ->
+    'dg_read_field_def_mainflux.AccessByKeyReq'(Other, Z1,
+						Z2, F@_1, F@_2, TrUserData).

 'dg_read_field_def_mainflux.AccessByKeyReq'(<<1:1, X:7,
-					 Rest/binary>>,
-				       N, Acc, F@_1, F@_2, TrUserData)
+					      Rest/binary>>,
+					    N, Acc, F@_1, F@_2, TrUserData)
    when N < 32 - 7 ->
    'dg_read_field_def_mainflux.AccessByKeyReq'(Rest, N + 7,
-					   X bsl N + Acc, F@_1, F@_2,
-					   TrUserData);
+						X bsl N + Acc, F@_1, F@_2,
+						TrUserData);
 'dg_read_field_def_mainflux.AccessByKeyReq'(<<0:1, X:7,
-					 Rest/binary>>,
-				       N, Acc, F@_1, F@_2, TrUserData) ->
+					      Rest/binary>>,
+					    N, Acc, F@_1, F@_2, TrUserData) ->
    Key = X bsl N + Acc,
    case Key of
      10 ->
-	  'd_field_mainflux.AccessByKeyReq_token'(Rest, 0, 0, F@_1,
-					     F@_2, TrUserData);
+	  'd_field_mainflux.AccessByKeyReq_token'(Rest, 0, 0,
+						  F@_1, F@_2, TrUserData);
      18 ->
-	  'd_field_mainflux.AccessByKeyReq_chanID'(Rest, 0, 0, F@_1,
-					      F@_2, TrUserData);
+	  'd_field_mainflux.AccessByKeyReq_chanID'(Rest, 0, 0,
+						   F@_1, F@_2, TrUserData);
      _ ->
 	  case Key band 7 of
 	    0 ->
-		'skip_varint_mainflux.AccessByKeyReq'(Rest, 0, 0, F@_1, F@_2,
-						 TrUserData);
+		'skip_varint_mainflux.AccessByKeyReq'(Rest, 0, 0, F@_1,
+						      F@_2, TrUserData);
 	    1 ->
-		'skip_64_mainflux.AccessByKeyReq'(Rest, 0, 0, F@_1, F@_2,
-					     TrUserData);
+		'skip_64_mainflux.AccessByKeyReq'(Rest, 0, 0, F@_1,
+						  F@_2, TrUserData);
 	    2 ->
-		'skip_length_delimited_mainflux.AccessByKeyReq'(Rest, 0, 0,
-							   F@_1, F@_2,
-							   TrUserData);
+		'skip_length_delimited_mainflux.AccessByKeyReq'(Rest, 0,
+								0, F@_1, F@_2,
+								TrUserData);
 	    3 ->
-		'skip_group_mainflux.AcAccessByKeyReqcessReq'(Rest, Key bsr 3, 0,
-						F@_1, F@_2, TrUserData);
+		'skip_group_mainflux.AccessByKeyReq'(Rest, Key bsr 3, 0,
+						     F@_1, F@_2, TrUserData);
 	    5 ->
-		'skip_32_mainflux.AccessByKeyReq'(Rest, 0, 0, F@_1, F@_2,
-					     TrUserData)
+		'skip_32_mainflux.AccessByKeyReq'(Rest, 0, 0, F@_1,
+						  F@_2, TrUserData)
 	  end
    end;
-'dg_read_field_def_mainflux.AccessByKeyReq'(<<>>, 0, 0, F@_1,
-				       F@_2, _) ->
+'dg_read_field_def_mainflux.AccessByKeyReq'(<<>>, 0, 0,
+					    F@_1, F@_2, _) ->
    #{token => F@_1, chanID => F@_2}.

-'d_field_mainflux.AccessByKeyReq'(<<1:1, X:7,
-				     Rest/binary>>,
-				   N, Acc, F@_1, F@_2, TrUserData)
+'d_field_mainflux.AccessByKeyReq_token'(<<1:1, X:7,
+					  Rest/binary>>,
+					N, Acc, F@_1, F@_2, TrUserData)
    when N < 57 ->
    'd_field_mainflux.AccessByKeyReq_token'(Rest, N + 7,
-				       X bsl N + Acc, F@_1, F@_2, TrUserData);
+					    X bsl N + Acc, F@_1, F@_2,
+					    TrUserData);
 'd_field_mainflux.AccessByKeyReq_token'(<<0:1, X:7,
-				     Rest/binary>>,
-				   N, Acc, _, F@_2, TrUserData) ->
+					  Rest/binary>>,
+					N, Acc, _, F@_2, TrUserData) ->
    {NewFValue, RestF} = begin
 			   Len = X bsl N + Acc,
 			   <<Utf8:Len/binary, Rest2/binary>> = Rest,
@ -472,18 +477,20 @@ decode_msg_2_doit('google.protobuf.Empty', Bin,
 			       TrUserData),
 			    Rest2}
 			 end,
-    'dfp_read_field_def_mainflux.AccessByKeyReq'(RestF, 0, 0,
-					    NewFValue, F@_2, TrUserData).
+    'dfp_read_field_def_mainflux.AccessByKeyReq'(RestF, 0,
+						 0, NewFValue, F@_2,
+						 TrUserData).

 'd_field_mainflux.AccessByKeyReq_chanID'(<<1:1, X:7,
-				      Rest/binary>>,
-				    N, Acc, F@_1, F@_2, TrUserData)
+					   Rest/binary>>,
+					 N, Acc, F@_1, F@_2, TrUserData)
    when N < 57 ->
    'd_field_mainflux.AccessByKeyReq_chanID'(Rest, N + 7,
-					X bsl N + Acc, F@_1, F@_2, TrUserData);
+					     X bsl N + Acc, F@_1, F@_2,
+					     TrUserData);
 'd_field_mainflux.AccessByKeyReq_chanID'(<<0:1, X:7,
-				      Rest/binary>>,
-				    N, Acc, F@_1, _, TrUserData) ->
+					   Rest/binary>>,
+					 N, Acc, F@_1, _, TrUserData) ->
    {NewFValue, RestF} = begin
 			   Len = X bsl N + Acc,
 			   <<Utf8:Len/binary, Rest2/binary>> = Rest,
@ -491,50 +498,52 @@ decode_msg_2_doit('google.protobuf.Empty', Bin,
 			       TrUserData),
 			    Rest2}
 			 end,
-    'dfp_read_field_def_mainflux.AccessByKeyReq'(RestF, 0, 0,
-					    F@_1, NewFValue, TrUserData).
+    'dfp_read_field_def_mainflux.AccessByKeyReq'(RestF, 0,
+						 0, F@_1, NewFValue,
+						 TrUserData).

 'skip_varint_mainflux.AccessByKeyReq'(<<1:1, _:7,
-				   Rest/binary>>,
-				 Z1, Z2, F@_1, F@_2, TrUserData) ->
-    'skip_varint_mainflux.AccessByKeyReq'(Rest, Z1, Z2, F@_1,
-				     F@_2, TrUserData);
+					Rest/binary>>,
+				      Z1, Z2, F@_1, F@_2, TrUserData) ->
+    'skip_varint_mainflux.AccessByKeyReq'(Rest, Z1, Z2,
+					  F@_1, F@_2, TrUserData);
 'skip_varint_mainflux.AccessByKeyReq'(<<0:1, _:7,
-				   Rest/binary>>,
-				 Z1, Z2, F@_1, F@_2, TrUserData) ->
-    'dfp_read_field_def_mainflux.AccessByKeyReq'(Rest, Z1, Z2,
-					    F@_1, F@_2, TrUserData).
+					Rest/binary>>,
+				      Z1, Z2, F@_1, F@_2, TrUserData) ->
+    'dfp_read_field_def_mainflux.AccessByKeyReq'(Rest, Z1,
+						 Z2, F@_1, F@_2, TrUserData).

-'skip_length_delimited_mainflux.AccessByKeyReq'(<<1:1, X:7,
-					     Rest/binary>>,
-					   N, Acc, F@_1, F@_2, TrUserData)
+'skip_length_delimited_mainflux.AccessByKeyReq'(<<1:1,
+						  X:7, Rest/binary>>,
+						N, Acc, F@_1, F@_2, TrUserData)
    when N < 57 ->
-    'skip_length_delimited_mainflux.AccessByKeyReq'(Rest, N + 7,
-					       X bsl N + Acc, F@_1, F@_2,
-					       TrUserData);
-'skip_length_delimited_mainflux.AccessByKeyReq'(<<0:1, X:7,
-					     Rest/binary>>,
-					   N, Acc, F@_1, F@_2, TrUserData) ->
+    'skip_length_delimited_mainflux.AccessByKeyReq'(Rest,
+						    N + 7, X bsl N + Acc, F@_1,
+						    F@_2, TrUserData);
+'skip_length_delimited_mainflux.AccessByKeyReq'(<<0:1,
+						  X:7, Rest/binary>>,
+						N, Acc, F@_1, F@_2,
+						TrUserData) ->
    Length = X bsl N + Acc,
    <<_:Length/binary, Rest2/binary>> = Rest,
-    'dfp_read_field_def_mainflux.AccessByKeyReq'(Rest2, 0, 0,
-					    F@_1, F@_2, TrUserData).
+    'dfp_read_field_def_mainflux.AccessByKeyReq'(Rest2, 0,
+						 0, F@_1, F@_2, TrUserData).

-'skip_group_mainflux.AccessByKeyReq'(Bin, FNum, Z2, F@_1,
-				F@_2, TrUserData) ->
+'skip_group_mainflux.AccessByKeyReq'(Bin, FNum, Z2,
+				     F@_1, F@_2, TrUserData) ->
    {_, Rest} = read_group(Bin, FNum),
-    'dfp_read_field_def_mainflux.AccessByKeyReq'(Rest, 0, Z2,
-					    F@_1, F@_2, TrUserData).
+    'dfp_read_field_def_mainflux.AccessByKeyReq'(Rest, 0,
+						 Z2, F@_1, F@_2, TrUserData).

-'skip_32_mainflux.AccessByKeyReq'(<<_:32, Rest/binary>>, Z1,
-			     Z2, F@_1, F@_2, TrUserData) ->
-    'dfp_read_field_def_mainflux.AccessByKeyReq'(Rest, Z1, Z2,
-					    F@_1, F@_2, TrUserData).
+'skip_32_mainflux.AccessByKeyReq'(<<_:32, Rest/binary>>,
+				  Z1, Z2, F@_1, F@_2, TrUserData) ->
+    'dfp_read_field_def_mainflux.AccessByKeyReq'(Rest, Z1,
+						 Z2, F@_1, F@_2, TrUserData).

-'skip_64_mainflux.AccessByKeyReq'(<<_:64, Rest/binary>>, Z1,
-			     Z2, F@_1, F@_2, TrUserData) ->
-    'dfp_read_field_def_mainflux.AccessByKeyReq'(Rest, Z1, Z2,
-					    F@_1, F@_2, TrUserData).
+'skip_64_mainflux.AccessByKeyReq'(<<_:64, Rest/binary>>,
+				  Z1, Z2, F@_1, F@_2, TrUserData) ->
+    'dfp_read_field_def_mainflux.AccessByKeyReq'(Rest, Z1,
+						 Z2, F@_1, F@_2, TrUserData).

 'decode_msg_mainflux.ThingID'(Bin, TrUserData) ->
    'dfp_read_field_def_mainflux.ThingID'(Bin, 0, 0,
@ -1164,7 +1173,8 @@ merge_msgs(Prev, New, MsgName, Opts) ->
    TrUserData = proplists:get_value(user_data, Opts),
    case MsgName of
      'mainflux.AccessByKeyReq' ->
-	  'merge_msg_mainflux.AccessByKeyReq'(Prev, New, TrUserData);
+	  'merge_msg_mainflux.AccessByKeyReq'(Prev, New,
+					      TrUserData);
      'mainflux.ThingID' ->
 	  'merge_msg_mainflux.ThingID'(Prev, New, TrUserData);
      'mainflux.AccessByIDReq' ->
@ -1248,7 +1258,8 @@ verify_msg(Msg, MsgName, Opts) ->
    TrUserData = proplists:get_value(user_data, Opts),
    case MsgName of
      'mainflux.AccessByKeyReq' ->
-	  'v_msg_mainflux.AccessByKeyReq'(Msg, [MsgName], TrUserData);
+	  'v_msg_mainflux.AccessByKeyReq'(Msg, [MsgName],
+					  TrUserData);
      'mainflux.ThingID' ->
 	  'v_msg_mainflux.ThingID'(Msg, [MsgName], TrUserData);
      'mainflux.AccessByIDReq' ->
@ -1267,7 +1278,8 @@ verify_msg(Msg, MsgName, Opts) ->

 -compile({nowarn_unused_function,'v_msg_mainflux.AccessByKeyReq'/3}).
 -dialyzer({nowarn_function,'v_msg_mainflux.AccessByKeyReq'/3}).
-'v_msg_mainflux.AccessByKeyReq'(#{} = M, Path, TrUserData) ->
+'v_msg_mainflux.AccessByKeyReq'(#{} = M, Path,
+				TrUserData) ->
    case M of
      #{token := F1} ->
 	  v_type_string(F1, [token | Path], TrUserData);
@ -1291,8 +1303,8 @@ verify_msg(Msg, MsgName, Opts) ->
 		   'mainflux.AccessByKeyReq'},
 		  M, Path);
 'v_msg_mainflux.AccessByKeyReq'(X, Path, _TrUserData) ->
-    mk_type_error({expected_msg, 'mainflux.AccessByKeyReq'}, X,
-		  Path).
+    mk_type_error({expected_msg, 'mainflux.AccessByKeyReq'},
+		  X, Path).

 -compile({nowarn_unused_function,'v_msg_mainflux.ThingID'/3}).
 -dialyzer({nowarn_function,'v_msg_mainflux.ThingID'/3}).
@ -1562,7 +1574,8 @@ get_service_names() ->

 get_service_def('mainflux.ThingsService') ->
    {{service, 'mainflux.ThingsService'},
-     [#{name => 'CanAccessByKey', input => 'mainflux.AccessByKeyReq',
+     [#{name => 'CanAccessByKey',
+	input => 'mainflux.AccessByKeyReq',
 	output => 'mainflux.ThingID', input_stream => false,
 	output_stream => false, opts => []},
      #{name => 'CanAccessByID',
@ -1595,7 +1608,8 @@ find_rpc_def(_, _) -> error.


 'find_rpc_def_mainflux.ThingsService'('CanAccessByKey') ->
-    #{name => 'CanAccessByKey', input => 'mainflux.AccessByKeyReq',
+    #{name => 'CanAccessByKey',
+      input => 'mainflux.AccessByKeyReq',
      output => 'mainflux.ThingID', input_stream => false,
      output_stream => false, opts => []};
 'find_rpc_def_mainflux.ThingsService'('CanAccessByID') ->
@ -1806,7 +1820,7 @@ get_protos_by_pkg_name_as_fqbin(E) ->


 gpb_version_as_string() ->
-    "4.9.0".
+    "4.10.5".

 gpb_version_as_list() ->
-    [4,9,0].
+    [4,10,5].
--- a/mqtt/verne/src/proto/message.erl
+++ b/mqtt/verne/src/proto/message.erl
@ -1,7 +1,7 @@
 %% -*- coding: utf-8 -*-
 %% @private
 %% Automatically generated, do not edit
-%% Generated by gpb_compile version 4.9.0
+%% Generated by gpb_compile version 4.10.5
 -module(message).

 -export([encode_msg/2, encode_msg/3]).
@ -2455,7 +2455,7 @@ get_protos_by_pkg_name_as_fqbin(E) ->


 gpb_version_as_string() ->
-    "4.9.0".
+    "4.10.5".

 gpb_version_as_list() ->
-    [4,9,0].
+    [4,10,5].