SINHASantos · pull · Dec 10, 2024 · Dec 10, 2024 · Dec 10, 2024 · Dec 10, 2024
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -28,7 +28,7 @@ variables:
   KANIKO_REGISTRY_MIRROR: docker-proxy.binary.picodata.io
   CACHE_PATHS: target
   CARGO_INCREMENTAL: 0
-  RUST_VERSION: "1.71"  # Note: without the quotes yaml thinks this is a float and removes the trailing 0
+  RUST_VERSION: "1.82"  # Note: without the quotes yaml thinks this is a float and removes the trailing 0
   CARGO_HOME: /shared-storage/tarantool-module/.cargo
   BASE_IMAGE_VANILLA: docker-public.binary.picodata.io/tarantool-module-build-base-vanilla
   BASE_IMAGE_FORK: docker-public.binary.picodata.io/tarantool-module-build-base-fork
@@ -139,7 +139,7 @@ build-base-image-fork-on-trigger:
         BASE_IMAGE_TAG: latest
   image:
     name: ${BASE_IMAGE_NAME}:${BASE_IMAGE_TAG}
-    pull_policy: [if-not-present]
+    pull_policy: [always]
   before_script:
     - |
       # Restore cache

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,15 +1,169 @@
-# Change Log
+<!--
+<TEMPLATE START>
 
 # [?.?.?] Unreleased
 
 ### Added
+- ?.
+
+### Changed
+- ?.
+
+### Fixed
+- ?.
+
+### Deprecated
+- ?.
+
+### Breaking
+- ?.
+
+### Added (picodata)
+- ?.
+
+### Changed (picodata)
+- ?.
+
+### Fixed (picodata)
+- ?.
+
+### Deprecated (picodata)
+- ?.
+
+### Breaking (picodata)
+- ?.
+
+<TEMPLATE END>
+-->
+
+# Change Log
+
+# [10.1.0] Unreleased
+
+- Add lock_timeout in fiber::Mutex to wait no more than needed
+
+# [10.0.0] Oct 2 2025
+
+- Introduced `AuthMethod::ScramSha256` for a new auth method in Picodata.
+
+# [9.0.0] Oct 1 2025
+
+### Changed
+
+- Unpinned the version of `linkme` crate (`0.3.29` -> `0.3`).
+
+- Replaced dependency from unmaintained `dlopen` crate to `libloading` of version `0.3`.
+
+- Replaced dependency from unmaintained `proc-macro-error` crate to `proc-macro-error2` of version `2`.
+
+### Fixed
+- Unpinned the version of `time` crate from a two-year old `0.3.17`
+- `space::Space::bsize` now returns `box.space.<space_name>:bsize()` instead of `box.space.<space_name>.index[0]:bsize()`
+
+### Breaking
+
+- As of [RUSTSEC-2025-0052](https://rustsec.org/advisories/RUSTSEC-2025-0052.html),
+  [async-std](https://github.com/async-rs/async-std) is not supported or maintaned
+  anymore. We've removed this package as the dependency, it's re-exports, and the
+  same with the implicit feature flag it added to the workspace.
+
+### Added (picodata)
+
+- `network::protocol::Config::cluster_uuid` optional field. When set, the client sends an `IPROTO_ID` message carrying this `cluster_uuid` immediately after greeting. This enables clients to ensure they connect only to an instance from the same cluster.
+- Added TLS support for iproto client (via new `TlsStream`).
+
+### Changed (picodata)
+
+- Handshake may include an ID phase before auth when `cluster_uuid` is provided. If a vanilla Tarantool responds to `IPROTO_ID` with `ER_INVALID_MSGPACK`, the client ignores it for compatibility and proceeds with authentication/ready state.
+
+# [8.0.0] Jun 24 2025
+
+### Changed
+
+- Unpinned the version of `tokio` crate optional dependency
+
+### Fixed
+
+- Fix `tlua::Push`, `tlua::PushInto` and `tlua::LuaRead` derive macros to support default values for type parameters,
+    and `tlua::LuaRead` to support default values for default values for const parameters.
+
+### Deprecated
+
+### Breaking
+
+- Split a single `index::Part` type into `Part<String>`, `Part<u32>` and `Part<NumOrStr>`,
+  depending on the accepted/returned types by the tarantool API
+
+# [7.0.0] May 26 2025
+
+### Added
+
+- `AuthMethod::DEFAULT` represents the default value of `AuthMethod`, but is available in constant contexts.
+- Support MsgPack ExtType encoding and decoding via `ExtStruct`
+- Support Tuple msgpack decoding
+- Support Decimal, UUID, Datetime msgpack encoding and decoding
+
+### Changed
+
+- 1.82 is now MSRV.
+
+### Fixed
+
+- `network::protocol::codec::Header::encode` will not truncate to `u8` an
+  `network::protocol::codec::IProtoType` integer from an outside stream at decoding.
+
+### Deprecated
+
+### Breaking changes
+
+- Use `extern "C-unwind"` instead of `extern "C"` for lua ffi functions, which
+  seems to help with lua_error!() in release builds on recent versions of rust.
+
+### Added (picodata)
+
+- `ffi::sql::PortC` either allows to append tuples and msgpacks to the port or
+  to iterate over the port data. It is also possible to manipulate with `PortC`
+  from the `FunctionCtx` of the called function.
+- Introduce `sql::sql_execute_into_port` and `sql::Statement::execute_into_port`
+  methods. Now it is possible to store SQL results directly into the port.
+
+### Changed (picodata)
+
+### Fixed (picodata)
+
+### Breaking changes (picodata)
+
+- `AuthMethod::default()` is now `Md5`, not `ChapSha1`.
+- `tarantool::tuple::Tuple::{as_named_buffer, names, name_count}` did not find their use, so they are now logging an
+  error message and panic. These functions are scheduled for removal in next major release and labeled as deprecated.
+
+### Deprecated (picodata)
+
+# [6.1.0] Dec 10 2024
+
+### Added
+
 - `network::client::tcp::TcpStream` not supports async connection, provided with `connect_async` and `connect_timeout_async` methods
+- `impl Default for log::TarantoolLogger`
+
+### Changed
+
+- `error::Result` type alias now has another generic parameter E, which defaults
+  to `tarantool::error::Error`, but allows this type alias to be used as a drop
+  in replacement from `std::result::Result`.
+
+### Fixed
 
+- `network::client::tcp::TcpStream` does not close underlying fd anymore. Now fd will be closed only when the last copy of tcp stream is dropped.
 
+### Deprecated
+
+- `network::client::tcp::UnsafeSendSyncTcpStream` is now deprected. `network::client::tcp::TcpStream` should be used instead.
 
 # [6.0.0] Nov 20 2024
 
 ### Added
+
 - `tlua::Push` trait implementations for `OsString`, `OsStr`, `Path`, `PathBuf`
 - `tlua::LuaRead` trait implementations for `OsString`, `PathBuf`
 - tlua::LuaTable::metatable which is a better alternative to the existing `tlua::LuaTable::get_or_create_metatable`
@@ -26,33 +180,36 @@ restricting time connection establishment.
 - `tlua::Nil` now supports (de)serialization via serde
 
 ### Changed
+
 - `network::protocol::codec::IProtoType` uses C language representation
 - `cbus::sync::std::ThreadWaker` now uses internal thread FIFO queue when blocking threads on send.
 - `#[tarantool::proc]` attribute doesn't add procs to a global array unless
   `stored_procs_slice` feature is enabled.
 - `proc::all_procs` will now panic if `stored_procs_slice` feature is disabled.
 
 ### Fixed
+
 - `tlua::{Push, PushInto, LuaRead}` now work for HashSet & HashMap with custom hashers.
 - Use after free in `fiber::Builder::start_non_joinable` when the fiber exits without yielding.
 - Incorrect, off-spec MP Ext type: caused runtime errors on some platforms.
 - Panic in coio test starting from 1.80 Rust.
 - Impossible to use procedural macros(like `tarantool::proc`, `tarantool::test`) through reexporting tarantool.
 
 ### Deprecated
+
 - tlua::LuaTable::get_or_create_metatable is deprecated now in favor of tlua::LuaTable::metatable.
 
 ### Breaking changes
+
 - Use `extern "C-unwind"` instead of `extern "C"` for all trampolines which take `*mut ffi::lua_State`
   (checked with `rg 'extern "C".*lua_State'`). `tlua::error!` throws an exception to unwind the stack,
   hence we need to use a proper ABI to fix UB in picodata.
 
 ### Breaking changes (picodata)
+
 - Add session ID to the argument list of the `sql_prepare_ext`.
 - Replace `sql_unprepare` with `sql_unprepare_ext` (contains an additional session ID argument).
 
-
-
 # [5.0.0] Aug 06 2024
 
 ### Added
@@ -216,12 +373,14 @@ restricting time connection establishment.
   **experimental** rust allocated implementation of tuple virtual table.
 
 ### Changed (picodata)
+
 - `Tuple::decode` & `ToTupleBuffer` implementation for `Tuple` is now a bit more
   efficient because one redundant tuple data copy is removed.
 
 ### Fixed (picodata)
 
 ### Breaking changes (picodata)
+
 - SQL module was totally refactored: all its public structures functions and FFIs have
   been changed.
 
@@ -294,7 +453,7 @@ restricting time connection establishment.
 
 - `define_str_enum` will no longer produce warning "`&` without an explicit
   lifetime name cannot be used here". For more information, see
-  https://github.com/rust-lang/rust/issues/115010.
+  <https://github.com/rust-lang/rust/issues/115010>.
 - `#[tarantool::test]` declares a special static variable which is usually
   invisible to the users, but previously it would have a not so unique name
   which would sometimes lead to name conflicts with user-defined items.

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "1"
 members = [
     "tarantool",
     "tarantool-proc",

diff --git a/README.md b/README.md
@@ -1,3 +1,10 @@
+# ⚠️  The project has been moved! ⚠️
+
+> The project was moved to [https://github.com/picodata/picodata](https://github.com/picodata/picodata/tree/master/tarantool)
+>
+> This repository is no longer maintained.
+
+
 # Tarantool Rust SDK
 
 [![Latest Version]][crates.io] [![Docs badge]][docs.rs]
@@ -56,7 +63,7 @@ rustflags = [
 Add the following lines to your project's Cargo.toml:
 ```toml
 [dependencies]
-tarantool = "6.0"
+tarantool = "7.0"
 
 [lib]
 crate-type = ["cdylib"]
@@ -66,8 +73,10 @@ See https://github.com/picodata/brod for example usage.
 
 ### Features
 
-- `net_box` - Enables protocol implementation (enabled by default)
-- `schema` - Enables schema manipulation utils (WIP as of now)
+- `net_box` - Enables IPROTO fiber aware client (enabled by default)
+- `network_client` - Enables a second implementation of IPROTO fiber aware client but with Rust async support (enabled by default)
+- `picodata` - Enables support for custom features added in picodata's fork of tarantool
+- `tokio_components` - Enables support for interfacing with tokio based logic through cbus
 
 ### Stored procedures
 
@@ -103,7 +112,7 @@ edition = "2018"
 # author, license, etc
 
 [dependencies]
-tarantool = "6.0"
+tarantool = "10.0"
 serde = "1.0"
 
 [lib]

diff --git a/docker/picodata.Dockerfile b/docker/picodata.Dockerfile
@@ -4,7 +4,7 @@ ARG RUST_VERSION
 
 RUN set -e; \
     rm -f /etc/yum.repos.d/pg.repo && \
-    yum -y install gcc git && \
+    yum -y install gcc git openssl-devel && \
     yum clean all
 
 # Install rust + cargo

diff --git a/docker/vanilla.Dockerfile b/docker/vanilla.Dockerfile
@@ -10,6 +10,8 @@ RUN curl -L https://tarantool.io/release/2/installer.sh | bash;
 RUN apt install -y \
     gcc \
     git \
+    libssl-dev \
+    pkg-config \
     tarantool \
     tarantool-dev \
     ;

diff --git a/examples/async-h1-client/src/lib.rs b/examples/async-h1-client/src/lib.rs
@@ -2,7 +2,6 @@ use http_types::{Method, Request, Url};
 use tarantool::error::Error;
 use tarantool::fiber;
 use tarantool::network::client::tcp::TcpStream;
-use tarantool::network::client::tcp::UnsafeSendSyncTcpStream;
 use tarantool::proc;
 
 #[proc]
@@ -17,14 +16,12 @@ fn get(url: &str) -> Result<(), Error> {
         let mut res = match url.scheme() {
             "http" => {
                 let stream = TcpStream::connect(host, 80).map_err(Error::other)?;
-                let stream = UnsafeSendSyncTcpStream(stream);
                 println!("Sending request over http...");
                 async_h1::connect(stream, req).await.map_err(Error::other)?
             }
             #[cfg(feature = "tls")]
             "https" => {
                 let stream = TcpStream::connect(host, 443).map_err(Error::other)?;
-                let stream = UnsafeSendSyncTcpStream(stream);
                 let stream = async_native_tls::connect(host, stream)
                     .await
                     .map_err(Error::other)?;

diff --git a/examples/tokio-hyper/Cargo.toml b/examples/tokio-hyper/Cargo.toml
@@ -7,7 +7,7 @@ license = "BSD-2-Clause"
 [dependencies]
 tarantool = { path = "../../tarantool" }
 hyper = { version = "0.14", features = ["full"] }
-tokio = { version = "=1.29.1", features = ["full"] }
+tokio = { version = "1", features = ["full"] }
 futures-util = "*"
 http-body-util = "0.1.0-rc.2"
 env_logger = "0.9.0"

diff --git a/tarantool-proc/Cargo.toml b/tarantool-proc/Cargo.toml
@@ -4,12 +4,12 @@ authors = [
 ]
 name = "tarantool-proc"
 description = "Tarantool proc macros"
-version = "3.2.0"
+version = "4.0.1"
 edition = "2021"
 license = "BSD-2-Clause"
 documentation = "https://docs.rs/tarantool-proc/"
 repository = "https://github.com/picodata/tarantool-module"
-rust-version = "1.61"
+rust-version = "1.82"
 
 [lib]
 proc-macro = true
@@ -19,7 +19,7 @@ syn = { version = "^1.0", features = [ "full", "extra-traits" ] }
 quote = "^1.0"
 proc-macro2 = "^1.0"
 darling = "0.14.2"
-proc-macro-error = "1"
+proc-macro-error2 = "2"
 
 [features]
 stored_procs_slice = []
diff --git a/tarantool-proc/src/lib.rs b/tarantool-proc/src/lib.rs
@@ -1,6 +1,6 @@
 use proc_macro::TokenStream;
 use proc_macro2::{Span, TokenStream as TokenStream2};
-use proc_macro_error::{proc_macro_error, SpanRange};
+use proc_macro_error2::{proc_macro_error, SpanRange};
 use quote::{quote, ToTokens};
 use syn::{
     parse_macro_input, parse_quote, punctuated::Punctuated, Attribute, AttributeArgs, DeriveInput,
@@ -34,7 +34,7 @@ pub fn test(attr: TokenStream, item: TokenStream) -> TokenStream {
 mod msgpack {
     use darling::FromDeriveInput;
     use proc_macro2::TokenStream;
-    use proc_macro_error::{abort, SpanRange};
+    use proc_macro_error2::{abort, SpanRange};
     use quote::{format_ident, quote, quote_spanned, ToTokens};
     use syn::{
         parse_quote, spanned::Spanned, Data, Field, Fields, FieldsNamed, FieldsUnnamed,
@@ -1054,7 +1054,7 @@ pub fn derive_encode(input: TokenStream) -> TokenStream {
         // The generated impl.
         impl #impl_generics #tarantool_crate::msgpack::Encode for #name #ty_generics #where_clause {
             fn encode(&self, w: &mut impl ::std::io::Write, context: &#tarantool_crate::msgpack::Context)
-                -> Result<(), #tarantool_crate::msgpack::EncodeError>
+                -> std::result::Result<(), #tarantool_crate::msgpack::EncodeError>
             {
                 use #tarantool_crate::msgpack::StructStyle;
                 #encode_fields