From bb363e9b9e22b9f7813bb55dab4de648a1700c30 Mon Sep 17 00:00:00 2001 From: JimMoen Date: Fri, 12 May 2023 09:58:35 +0800 Subject: [PATCH 1/3] chore: bump dependency vsn * bump `snappyer` ~> 1.2.9 - as dependency of `kafka_protocol` ~> 4.1.3 - as dependency of `brod` * bump `rocksdb` ~> 1.7.2-emqx-11 --- apps/emqx_bridge_kafka/rebar.config | 3 ++- mix.exs | 6 +++--- rebar.config | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/emqx_bridge_kafka/rebar.config b/apps/emqx_bridge_kafka/rebar.config index 68a8d3e69..cfe84a2a8 100644 --- a/apps/emqx_bridge_kafka/rebar.config +++ b/apps/emqx_bridge_kafka/rebar.config @@ -1,9 +1,10 @@ %% -*- mode: erlang; -*- {erl_opts, [debug_info]}. {deps, [ {wolff, {git, "https://github.com/kafka4beam/wolff.git", {tag, "1.7.5"}}} - , {kafka_protocol, {git, "https://github.com/kafka4beam/kafka_protocol.git", {tag, "4.1.2"}}} + , {kafka_protocol, {git, "https://github.com/kafka4beam/kafka_protocol.git", {tag, "4.1.3"}}} , {brod_gssapi, {git, "https://github.com/kafka4beam/brod_gssapi.git", {tag, "v0.1.0"}}} , {brod, {git, "https://github.com/kafka4beam/brod.git", {tag, "3.16.8"}}} + , {snappyer, "1.2.9"} , {emqx_connector, {path, "../../apps/emqx_connector"}} , {emqx_resource, {path, "../../apps/emqx_resource"}} , {emqx_bridge, {path, "../../apps/emqx_bridge"}} diff --git a/mix.exs b/mix.exs index 3eab0d70d..2e2882e15 100644 --- a/mix.exs +++ b/mix.exs @@ -54,7 +54,7 @@ defmodule EMQXUmbrella.MixProject do {:jiffy, github: "emqx/jiffy", tag: "1.0.5", override: true}, {:cowboy, github: "emqx/cowboy", tag: "2.9.0", override: true}, {:esockd, github: "emqx/esockd", tag: "5.9.6", override: true}, - {:rocksdb, github: "emqx/erlang-rocksdb", tag: "1.7.2-emqx-9", override: true}, + {:rocksdb, github: "emqx/erlang-rocksdb", tag: "1.7.2-emqx-11", override: true}, {:ekka, github: "emqx/ekka", tag: "0.15.2", override: true}, {:gen_rpc, github: "emqx/gen_rpc", tag: "2.8.1", override: true}, {:grpc, github: "emqx/grpc-erl", tag: "0.6.7", override: true}, @@ -195,10 +195,10 @@ defmodule EMQXUmbrella.MixProject do {:hstreamdb_erl, github: "hstreamdb/hstreamdb_erl", tag: "0.2.5"}, {:influxdb, github: "emqx/influxdb-client-erl", tag: "1.1.9", override: true}, {:wolff, github: "kafka4beam/wolff", tag: "1.7.5"}, - {:kafka_protocol, github: "kafka4beam/kafka_protocol", tag: "4.1.2", override: true}, + {:kafka_protocol, github: "kafka4beam/kafka_protocol", tag: "4.1.3", override: true}, {:brod_gssapi, github: "kafka4beam/brod_gssapi", tag: "v0.1.0"}, {:brod, github: "kafka4beam/brod", tag: "3.16.8"}, - {:snappyer, "1.2.8", override: true}, + {:snappyer, "1.2.9", override: true}, {:crc32cer, "0.1.8", override: true}, {:supervisor3, "1.1.12", override: true}, {:opentsdb, github: "emqx/opentsdb-client-erl", tag: "v0.5.1", override: true}, diff --git a/rebar.config b/rebar.config index 0aab04892..81545a7be 100644 --- a/rebar.config +++ b/rebar.config @@ -61,7 +61,7 @@ , {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}} , {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.0"}}} , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.6"}}} - , {rocksdb, {git, "https://github.com/emqx/erlang-rocksdb", {tag, "1.7.2-emqx-9"}}} + , {rocksdb, {git, "https://github.com/emqx/erlang-rocksdb", {tag, "1.7.2-emqx-11"}}} , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.15.2"}}} , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.1"}}} , {grpc, {git, "https://github.com/emqx/grpc-erl", {tag, "0.6.7"}}} From 909d3485702f90b63144ee166219f9294f691311 Mon Sep 17 00:00:00 2001 From: JimMoen Date: Tue, 30 May 2023 11:23:25 +0800 Subject: [PATCH 2/3] chore: fix spec typo --- apps/emqx/src/persistent_session/emqx_persistent_session.erl | 2 +- apps/emqx_ft/src/emqx_ft_storage_exporter.erl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/emqx/src/persistent_session/emqx_persistent_session.erl b/apps/emqx/src/persistent_session/emqx_persistent_session.erl index 3e9e00c81..bfda233e1 100644 --- a/apps/emqx/src/persistent_session/emqx_persistent_session.erl +++ b/apps/emqx/src/persistent_session/emqx_persistent_session.erl @@ -229,7 +229,7 @@ discard_if_present(ClientID) -> ok end. --spec discard(binary(), emgx_session:session()) -> emgx_session:session(). +-spec discard(binary(), emqx_session:session()) -> emqx_session:session(). discard(ClientID, Session) -> discard_opt(is_store_enabled(), ClientID, Session). diff --git a/apps/emqx_ft/src/emqx_ft_storage_exporter.erl b/apps/emqx_ft/src/emqx_ft_storage_exporter.erl index 591173615..9e6f83b7f 100644 --- a/apps/emqx_ft/src/emqx_ft_storage_exporter.erl +++ b/apps/emqx_ft/src/emqx_ft_storage_exporter.erl @@ -38,7 +38,7 @@ -export_type([export/0]). --type storage() :: emxt_ft_storage_fs:storage(). +-type storage() :: emqx_ft_storage_fs:storage(). -type transfer() :: emqx_ft:transfer(). -type filemeta() :: emqx_ft:filemeta(). -type checksum() :: emqx_ft:checksum(). From 8569fac6eb98290a206146743394d00cc4dd158b Mon Sep 17 00:00:00 2001 From: JimMoen Date: Tue, 30 May 2023 14:00:20 +0800 Subject: [PATCH 3/3] fix: make static_check happy --- apps/emqx_ft/src/emqx_ft_storage_exporter.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx_ft/src/emqx_ft_storage_exporter.erl b/apps/emqx_ft/src/emqx_ft_storage_exporter.erl index 9e6f83b7f..601f8b112 100644 --- a/apps/emqx_ft/src/emqx_ft_storage_exporter.erl +++ b/apps/emqx_ft/src/emqx_ft_storage_exporter.erl @@ -38,7 +38,7 @@ -export_type([export/0]). --type storage() :: emqx_ft_storage_fs:storage(). +-type storage() :: emqx_ft_storage_fs:storage() | undefined. -type transfer() :: emqx_ft:transfer(). -type filemeta() :: emqx_ft:filemeta(). -type checksum() :: emqx_ft:checksum().