diff --git a/Cargo.lock b/Cargo.lock index 8390996..124e371 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -106,11 +106,11 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" dependencies = [ - "async-lock", + "async-lock 2.7.0", "async-task", "concurrent-queue", - "fastrand", - "futures-lite", + "fastrand 1.9.0", + "futures-lite 1.13.0", "slab", ] @@ -122,10 +122,10 @@ checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" dependencies = [ "async-channel", "async-executor", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.7.0", "blocking", - "futures-lite", + "futures-lite 1.13.0", "once_cell", ] @@ -135,20 +135,39 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.7.0", "autocfg", "cfg-if", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", - "polling", - "rustix", + "polling 2.8.0", + "rustix 0.37.27", "slab", "socket2 0.4.9", "waker-fn", ] +[[package]] +name = "async-io" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +dependencies = [ + "async-lock 3.4.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.2", + "rustix 0.38.34", + "slab", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "async-lock" version = "2.7.0" @@ -159,24 +178,25 @@ dependencies = [ ] [[package]] -name = "async-mutex" -version = "1.4.0" +name = "async-lock" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 2.5.3", + "event-listener 5.3.1", + "event-listener-strategy", + "pin-project-lite", ] [[package]] name = "async-net" -version = "1.7.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4051e67316bc7eff608fe723df5d32ed639946adcd69e07df41fd42a7b411f1f" +checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" dependencies = [ - "async-io", - "autocfg", + "async-io 2.3.3", "blocking", - "futures-lite", + "futures-lite 2.3.0", ] [[package]] @@ -185,28 +205,18 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" dependencies = [ - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.7.0", "autocfg", "blocking", "cfg-if", "event-listener 2.5.3", - "futures-lite", - "rustix", + "futures-lite 1.13.0", + "rustix 0.37.27", "signal-hook", "windows-sys 0.48.0", ] -[[package]] -name = "async-rwlock" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261803dcc39ba9e72760ba6e16d0199b1eef9fc44e81bffabbebb9f5aea3906c" -dependencies = [ - "async-mutex", - "event-listener 2.5.3", -] - [[package]] name = "async-std" version = "1.12.0" @@ -215,14 +225,14 @@ checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ "async-channel", "async-global-executor", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.7.0", "async-process", "crossbeam-utils", "futures-channel", "futures-core", "futures-io", - "futures-lite", + "futures-lite 1.13.0", "gloo-timers", "kv-log-macro", "log", @@ -242,13 +252,13 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.72", ] [[package]] @@ -301,7 +311,7 @@ version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.3.2", + "bitflags 2.6.0", "cexpr", "clang-sys", "itertools", @@ -313,7 +323,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.18", + "syn 2.0.72", "which", ] @@ -325,9 +335,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "blocking" @@ -336,11 +346,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" dependencies = [ "async-channel", - "async-lock", + "async-lock 2.7.0", "async-task", "atomic-waker", - "fastrand", - "futures-lite", + "fastrand 1.9.0", + "futures-lite 1.13.0", "log", ] @@ -358,9 +368,9 @@ checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "bytesize" @@ -397,9 +407,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cfg_aliases" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" @@ -434,9 +444,9 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -485,9 +495,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.14.4" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -495,58 +505,58 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.4" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] name = "darling_macro" -version = "0.14.4" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] name = "derive_builder" -version = "0.12.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.12.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" dependencies = [ "darling", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] name = "derive_builder_macro" -version = "0.12.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] @@ -572,14 +582,14 @@ dependencies = [ [[package]] name = "educe" -version = "0.4.22" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "079044df30bb07de7d846d41a184c4b00e66ebdac93ee459253474f3a47e50ae" +checksum = "1d7bc049e1bd8cdeb31b68bbd586a9464ecf9f3944af3958a7a9d0f8b9799417" dependencies = [ "enum-ordinalize", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] @@ -590,15 +600,22 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "enum-ordinalize" -version = "3.1.13" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4f76552f53cefc9a7f64987c3701b99d982f7690606fd67de1d09712fbf52f1" +checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5" +dependencies = [ + "enum-ordinalize-derive", +] + +[[package]] +name = "enum-ordinalize-derive" +version = "4.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" dependencies = [ - "num-bigint", - "num-traits", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.72", ] [[package]] @@ -632,23 +649,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] @@ -659,15 +665,25 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.1.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", "pin-project-lite", ] +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.1", + "pin-project-lite", +] + [[package]] name = "eyre" version = "0.6.8" @@ -687,6 +703,12 @@ dependencies = [ "instant", ] +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + [[package]] name = "fixedbitset" version = "0.4.2" @@ -726,13 +748,12 @@ dependencies = [ [[package]] name = "fluvio" -version = "0.22.3" -source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.9#c93d7c33b0a4a48b30050a5faf5a4f4ee211aca1" +version = "0.23.1" +source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.11#98cfc21314c93d4c2898edc9e2160f280622be21" dependencies = [ "anyhow", "async-channel", - "async-lock", - "async-rwlock", + "async-lock 3.4.0", "async-trait", "base64", "bytes", @@ -740,15 +761,17 @@ dependencies = [ "chrono", "derive_builder", "dirs", - "event-listener 3.1.0", + "event-listener 5.3.1", "fluvio-compression", - "fluvio-future 0.6.2", + "fluvio-future", "fluvio-protocol", "fluvio-sc-schema", "fluvio-smartmodule", "fluvio-socket", "fluvio-spu-schema", + "fluvio-stream-dispatcher", "fluvio-types", + "futures-lite 2.3.0", "futures-util", "once_cell", "pin-project", @@ -764,8 +787,8 @@ dependencies = [ [[package]] name = "fluvio-compression" -version = "0.3.2" -source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.9#c93d7c33b0a4a48b30050a5faf5a4f4ee211aca1" +version = "0.3.3" +source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.11#98cfc21314c93d4c2898edc9e2160f280622be21" dependencies = [ "bytes", "flate2", @@ -778,8 +801,8 @@ dependencies = [ [[package]] name = "fluvio-controlplane-metadata" -version = "0.28.2" -source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.9#c93d7c33b0a4a48b30050a5faf5a4f4ee211aca1" +version = "0.29.0" +source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.11#98cfc21314c93d4c2898edc9e2160f280622be21" dependencies = [ "anyhow", "async-trait", @@ -788,7 +811,7 @@ dependencies = [ "bytesize", "derive_builder", "flate2", - "fluvio-future 0.6.2", + "fluvio-future", "fluvio-protocol", "fluvio-stream-model", "fluvio-types", @@ -805,42 +828,28 @@ dependencies = [ [[package]] name = "fluvio-future" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7bb78c21409e7d24567b9b8a0d880e13ae5ef8fbbfb2a514c3966cd83e078c9" +checksum = "0a28090046453db33a8bace0e1f71350b9878cd7fb576e48592ae8284bc83c7e" dependencies = [ "anyhow", - "async-io", + "async-io 2.3.3", "async-net", "async-std", "async-trait", "cfg-if", "fluvio-wasm-timer", - "futures-lite", + "futures-lite 2.3.0", "futures-util", - "log", "openssl", "openssl-sys", "pin-project", - "socket2 0.5.4", + "socket2 0.5.7", "thiserror", "tracing", "ws_stream_wasm", ] -[[package]] -name = "fluvio-future" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a28090046453db33a8bace0e1f71350b9878cd7fb576e48592ae8284bc83c7e" -dependencies = [ - "anyhow", - "async-std", - "cfg-if", - "thiserror", - "tracing", -] - [[package]] name = "fluvio-java" version = "0.10.1" @@ -850,21 +859,22 @@ dependencies = [ "env_logger", "flapigen", "fluvio", - "fluvio-future 0.7.0", + "fluvio-future", "log", ] [[package]] name = "fluvio-protocol" -version = "0.10.15" -source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.9#c93d7c33b0a4a48b30050a5faf5a4f4ee211aca1" +version = "0.11.0" +source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.11#98cfc21314c93d4c2898edc9e2160f280622be21" dependencies = [ "bytes", + "cfg-if", "content_inspector", "crc32c", "eyre", "fluvio-compression", - "fluvio-future 0.6.2", + "fluvio-future", "fluvio-protocol-derive", "fluvio-types", "flv-util", @@ -878,7 +888,7 @@ dependencies = [ [[package]] name = "fluvio-protocol-derive" version = "0.5.4" -source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.9#c93d7c33b0a4a48b30050a5faf5a4f4ee211aca1" +source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.11#98cfc21314c93d4c2898edc9e2160f280622be21" dependencies = [ "proc-macro2", "quote", @@ -888,8 +898,8 @@ dependencies = [ [[package]] name = "fluvio-sc-schema" -version = "0.24.0" -source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.9#c93d7c33b0a4a48b30050a5faf5a4f4ee211aca1" +version = "0.24.2" +source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.11#98cfc21314c93d4c2898edc9e2160f280622be21" dependencies = [ "anyhow", "fluvio-controlplane-metadata", @@ -906,8 +916,8 @@ dependencies = [ [[package]] name = "fluvio-smartmodule" -version = "0.7.3" -source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.9#c93d7c33b0a4a48b30050a5faf5a4f4ee211aca1" +version = "0.7.4" +source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.11#98cfc21314c93d4c2898edc9e2160f280622be21" dependencies = [ "eyre", "fluvio-protocol", @@ -919,26 +929,27 @@ dependencies = [ [[package]] name = "fluvio-smartmodule-derive" version = "0.6.3" -source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.9#c93d7c33b0a4a48b30050a5faf5a4f4ee211aca1" +source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.11#98cfc21314c93d4c2898edc9e2160f280622be21" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.72", ] [[package]] name = "fluvio-socket" -version = "0.14.8" -source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.9#c93d7c33b0a4a48b30050a5faf5a4f4ee211aca1" +version = "0.14.9" +source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.11#98cfc21314c93d4c2898edc9e2160f280622be21" dependencies = [ + "anyhow", "async-channel", - "async-lock", + "async-lock 3.4.0", "async-trait", "built", "bytes", "cfg-if", - "event-listener 3.1.0", - "fluvio-future 0.6.2", + "event-listener 5.3.1", + "fluvio-future", "fluvio-protocol", "futures-util", "nix", @@ -953,14 +964,14 @@ dependencies = [ [[package]] name = "fluvio-spu-schema" -version = "0.14.7" -source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.9#c93d7c33b0a4a48b30050a5faf5a4f4ee211aca1" +version = "0.15.0" +source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.11#98cfc21314c93d4c2898edc9e2160f280622be21" dependencies = [ "bytes", "derive_builder", "educe", "flate2", - "fluvio-future 0.6.2", + "fluvio-future", "fluvio-protocol", "fluvio-smartmodule", "fluvio-types", @@ -969,13 +980,37 @@ dependencies = [ "tracing", ] +[[package]] +name = "fluvio-stream-dispatcher" +version = "0.13.4" +source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.11#98cfc21314c93d4c2898edc9e2160f280622be21" +dependencies = [ + "anyhow", + "async-channel", + "async-lock 3.4.0", + "async-trait", + "cfg-if", + "event-listener 5.3.1", + "fluvio-future", + "fluvio-stream-model", + "fluvio-types", + "futures-util", + "once_cell", + "serde", + "serde_yaml", + "tempfile", + "thiserror", + "tokio", + "tracing", +] + [[package]] name = "fluvio-stream-model" -version = "0.11.2" -source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.9#c93d7c33b0a4a48b30050a5faf5a4f4ee211aca1" +version = "0.11.4" +source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.11#98cfc21314c93d4c2898edc9e2160f280622be21" dependencies = [ - "async-rwlock", - "event-listener 3.1.0", + "async-lock 3.4.0", + "event-listener 5.3.1", "k8-types", "once_cell", "serde", @@ -984,10 +1019,10 @@ dependencies = [ [[package]] name = "fluvio-types" -version = "0.4.6" -source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.9#c93d7c33b0a4a48b30050a5faf5a4f4ee211aca1" +version = "0.5.0" +source = "git+https://github.com/infinyon/fluvio.git?tag=v0.11.11#98cfc21314c93d4c2898edc9e2160f280622be21" dependencies = [ - "event-listener 3.1.0", + "event-listener 5.3.1", "serde", "thiserror", "toml", @@ -1057,9 +1092,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1067,9 +1102,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" @@ -1084,9 +1119,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -1094,7 +1129,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -1103,34 +1138,47 @@ dependencies = [ "waker-fn", ] +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.1.0", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.72", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1203,6 +1251,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "humantime" version = "2.1.0" @@ -1292,7 +1346,7 @@ version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.1", "libc", "windows-sys 0.48.0", ] @@ -1332,9 +1386,9 @@ dependencies = [ [[package]] name = "k8-types" -version = "0.8.5" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f604a19941d3a538c86e8d2944b99cec1acd46043d9544804f2aaf0342a8401" +checksum = "5b1996eb39fe3991c64d32262261d3a37a8a43fcf7bc3a5456ab399f02a50114" dependencies = [ "serde", "serde_json", @@ -1392,9 +1446,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" @@ -1412,6 +1466,12 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + [[package]] name = "lock_api" version = "0.4.9" @@ -1463,11 +1523,11 @@ dependencies = [ [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.3.2", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -1483,17 +1543,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "num-bigint" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-integer" version = "0.1.45" @@ -1534,7 +1583,7 @@ version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.3.2", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -1551,7 +1600,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.72", ] [[package]] @@ -1584,9 +1633,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "parking" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -1656,7 +1705,7 @@ checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.72", ] [[package]] @@ -1693,20 +1742,35 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "polling" +version = "3.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.28" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1779,10 +1843,23 @@ dependencies = [ "errno", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.7", "windows-sys 0.48.0", ] +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys 0.4.14", + "windows-sys 0.52.0", +] + [[package]] name = "rustversion" version = "1.0.12" @@ -1833,7 +1910,7 @@ checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.72", ] [[package]] @@ -1942,12 +2019,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1958,9 +2035,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -1997,15 +2074,27 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand 2.1.0", + "rustix 0.38.34", + "windows-sys 0.52.0", +] + [[package]] name = "thiserror" version = "1.0.40" @@ -2023,7 +2112,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.72", ] [[package]] @@ -2045,7 +2134,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.72", ] [[package]] @@ -2117,7 +2206,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.72", ] [[package]] @@ -2202,7 +2291,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.72", "wasm-bindgen-shared", ] @@ -2236,7 +2325,7 @@ checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/Cargo.toml b/Cargo.toml index 79864cb..fc4d42f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,6 +16,6 @@ bindgen = { version = "0.69.4", default-features = false, features = ["logging", [dependencies] log = "^0.4.22" -fluvio = { features = ["admin"], git = "https://github.com/infinyon/fluvio.git", tag = "v0.11.9" } +fluvio = { features = ["admin"], git = "https://github.com/infinyon/fluvio.git", tag = "v0.11.11" } fluvio-future = { version = "0.7.0", features = ["task", "io"] } anyhow = "1.0.86" diff --git a/src/java_glue.rs.in b/src/java_glue.rs.in index f4089d5..f869be6 100644 --- a/src/java_glue.rs.in +++ b/src/java_glue.rs.in @@ -1,7 +1,7 @@ use fluvio::{ Fluvio, PartitionConsumer, - TopicProducer, + TopicProducerPool, FluvioError, dataplane::link::ErrorCode, Offset, @@ -41,7 +41,7 @@ mod _Fluvio { pub fn topic_producer( fluvio: &Fluvio, topic: String, - ) -> Result { + ) -> Result { run_block_on(fluvio.topic_producer(topic)).map_err(anyhow_error_to_string) } } @@ -94,7 +94,7 @@ foreign_class!( fn _Fluvio::topic_producer( &self, topic: String - ) -> Result; alias producer; + ) -> Result; alias producer; // https://github.com/Dushistov/flapigen-rs/issues/253#issuecomment-515672499 foreign_code r#" @@ -173,14 +173,14 @@ foreign_class!(class FluvioError { mod _TopicProducer { use super::*; pub fn send( - producer: &TopicProducer, + producer: &TopicProducerPool, key: &[u8], value: &[u8], ) -> Result<(), String> { run_block_on(producer.send(key, value)).map_err(anyhow_error_to_string).map(|_| ()) } pub fn flush( - producer: &TopicProducer, + producer: &TopicProducerPool, ) -> Result<(), String> { run_block_on(producer.flush()).map_err(anyhow_error_to_string) } @@ -188,7 +188,7 @@ mod _TopicProducer { foreign_class!( ///

Sends records to a particular topic.

class TopicProducer { - self_type TopicProducer; + self_type TopicProducerPool; private constructor = empty; /// Send a key/value record to this topic.