yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: IoTDB name for version option 

The previous name for the version option was v1.0.x which is clearly
wrong since this option was tested against IoTDB version v1.1.0. This
commit fixes this by renaming the option to v1.x.

Fixes:
https://emqx.atlassian.net/browse/EMQX-9926
This commit is contained in:
Kjell Winblad 2023-05-23 10:57:05 +02:00
parent d19ddb1832
commit 89ea1646be
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_bridge_iotdb/include/emqx_bridge_iotdb.hrl
View File

@ -5,7 +5,7 @@
-ifndef(EMQX_BRIDGE_IOTDB_HRL). -ifndef(EMQX_BRIDGE_IOTDB_HRL).
-define(EMQX_BRIDGE_IOTDB_HRL, true). -define(EMQX_BRIDGE_IOTDB_HRL, true).
-define(VSN_1_0_X, 'v1.0.x'). -define(VSN_1_X, 'v1.x').
-define(VSN_0_13_X, 'v0.13.x'). -define(VSN_0_13_X, 'v0.13.x').
-endif. -endif.

6
apps/emqx_bridge_iotdb/src/emqx_bridge_iotdb.erl
View File

@ -109,10 +109,10 @@ basic_config() ->
)}, )},
{iotdb_version, {iotdb_version,
mk( mk(
hoconsc:enum([?VSN_1_0_X, ?VSN_0_13_X]), hoconsc:enum([?VSN_1_X, ?VSN_0_13_X]),
#{ #{
desc => ?DESC("config_iotdb_version"), desc => ?DESC("config_iotdb_version"),
default => ?VSN_1_0_X default => ?VSN_1_X
} }
)} )}
] ++ resource_creation_opts() ++ ] ++ resource_creation_opts() ++
@ -217,7 +217,7 @@ conn_bridge_example(_Method, Type) ->
is_aligned => false, is_aligned => false,
device_id => <<"my_device">>, device_id => <<"my_device">>,
base_url => <<"http://iotdb.local:18080/">>, base_url => <<"http://iotdb.local:18080/">>,
iotdb_version => ?VSN_1_0_X, iotdb_version => ?VSN_1_X,
connect_timeout => <<"15s">>, connect_timeout => <<"15s">>,
pool_type => <<"random">>, pool_type => <<"random">>,
pool_size => 8, pool_size => 8,

8
apps/emqx_bridge_iotdb/src/emqx_bridge_iotdb_impl.erl
View File

@ -282,7 +282,7 @@ make_iotdb_insert_request(MessageUnparsedPayload, State) ->
Message = MessageUnparsedPayload#{payload => PayloadParsed}, Message = MessageUnparsedPayload#{payload => PayloadParsed},
IsAligned = maps:get(is_aligned, State, false), IsAligned = maps:get(is_aligned, State, false),
DeviceId = device_id(Message, State), DeviceId = device_id(Message, State),
IotDBVsn = maps:get(iotdb_version, State, ?VSN_1_0_X), IotDBVsn = maps:get(iotdb_version, State, ?VSN_1_X),
Payload = make_list(maps:get(payload, Message)), Payload = make_list(maps:get(payload, Message)),
PreProcessedData = preproc_data_list(Payload), PreProcessedData = preproc_data_list(Payload),
DataList = proc_data(PreProcessedData, Message), DataList = proc_data(PreProcessedData, Message),
@ -351,15 +351,15 @@ insert_value(1, Data, [Value | Values]) ->
insert_value(Index, Data, [Value | Values]) -> insert_value(Index, Data, [Value | Values]) ->
[[null | Value] | insert_value(Index - 1, Data, Values)]. [[null | Value] | insert_value(Index - 1, Data, Values)].
iotdb_field_key(is_aligned, ?VSN_1_0_X) -> iotdb_field_key(is_aligned, ?VSN_1_X) ->
<<"is_aligned">>; <<"is_aligned">>;
iotdb_field_key(is_aligned, ?VSN_0_13_X) -> iotdb_field_key(is_aligned, ?VSN_0_13_X) ->
<<"isAligned">>; <<"isAligned">>;
iotdb_field_key(device_id, ?VSN_1_0_X) -> iotdb_field_key(device_id, ?VSN_1_X) ->
<<"device">>; <<"device">>;
iotdb_field_key(device_id, ?VSN_0_13_X) -> iotdb_field_key(device_id, ?VSN_0_13_X) ->
<<"deviceId">>; <<"deviceId">>;
iotdb_field_key(data_types, ?VSN_1_0_X) -> iotdb_field_key(data_types, ?VSN_1_X) ->
<<"data_types">>; <<"data_types">>;
iotdb_field_key(data_types, ?VSN_0_13_X) -> iotdb_field_key(data_types, ?VSN_0_13_X) ->
<<"dataTypes">>. <<"dataTypes">>.