From 7698a6ac8e0376f32cdcaf428b4598c71ed93f87 Mon Sep 17 00:00:00 2001 From: liuyi Date: Fri, 10 Nov 2023 10:25:28 +0800 Subject: [PATCH] chore(server): bump octobase versions (#4893) Co-authored-by: DarkSky --- Cargo.lock | 92 +++++++++++++++++++---------- packages/backend/storage/Cargo.toml | 6 +- packages/frontend/native/Cargo.toml | 4 +- 3 files changed, 65 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c5da8199bc..72fcab10cf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -758,9 +758,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -773,9 +773,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -783,15 +783,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -811,15 +811,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", @@ -828,15 +828,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-timer" @@ -846,9 +846,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -1112,7 +1112,7 @@ dependencies = [ [[package]] name = "jwst-codec" version = "0.1.0" -source = "git+https://github.com/toeverything/OctoBase.git?rev=ad51b2c#ad51b2cde4f7f866be829f0bf169434940ada570" +source = "git+https://github.com/toeverything/OctoBase.git?rev=aad9e5b#aad9e5b7e9d6f479e6cf7555f5845bbbaaadbc66" dependencies = [ "arbitrary", "bitvec", @@ -1121,9 +1121,10 @@ dependencies = [ "loom", "nanoid", "nom", - "ordered-float", + "ordered-float 4.1.1", "rand", "rand_chacha", + "rand_distr", "serde", "serde_json", "thiserror", @@ -1132,7 +1133,7 @@ dependencies = [ [[package]] name = "jwst-core" version = "0.1.0" -source = "git+https://github.com/toeverything/OctoBase.git?rev=ad51b2c#ad51b2cde4f7f866be829f0bf169434940ada570" +source = "git+https://github.com/toeverything/OctoBase.git?rev=aad9e5b#aad9e5b7e9d6f479e6cf7555f5845bbbaaadbc66" dependencies = [ "async-trait", "base64", @@ -1144,17 +1145,16 @@ dependencies = [ "serde", "serde_json", "thiserror", - "tokio", "tracing", ] [[package]] name = "jwst-logger" version = "0.1.0" -source = "git+https://github.com/toeverything/OctoBase.git?rev=ad51b2c#ad51b2cde4f7f866be829f0bf169434940ada570" +source = "git+https://github.com/toeverything/OctoBase.git?rev=aad9e5b#aad9e5b7e9d6f479e6cf7555f5845bbbaaadbc66" dependencies = [ "chrono", - "nu-ansi-term", + "nu-ansi-term 0.49.0", "tracing", "tracing-log", "tracing-stackdriver", @@ -1164,7 +1164,7 @@ dependencies = [ [[package]] name = "jwst-storage" version = "0.1.0" -source = "git+https://github.com/toeverything/OctoBase.git?rev=ad51b2c#ad51b2cde4f7f866be829f0bf169434940ada570" +source = "git+https://github.com/toeverything/OctoBase.git?rev=aad9e5b#aad9e5b7e9d6f479e6cf7555f5845bbbaaadbc66" dependencies = [ "anyhow", "async-trait", @@ -1189,7 +1189,7 @@ dependencies = [ [[package]] name = "jwst-storage-migration" version = "0.1.0" -source = "git+https://github.com/toeverything/OctoBase.git?rev=ad51b2c#ad51b2cde4f7f866be829f0bf169434940ada570" +source = "git+https://github.com/toeverything/OctoBase.git?rev=aad9e5b#aad9e5b7e9d6f479e6cf7555f5845bbbaaadbc66" dependencies = [ "sea-orm-migration", "tokio", @@ -1290,9 +1290,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "loom" -version = "0.6.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce9394216e2be01e607cf9e9e2b64c387506df1e768b14cbd2854a3650c3c03e" +checksum = "7e045d70ddfbc984eacfa964ded019534e8f6cbf36f6410aee0ed5cefa5a9175" dependencies = [ "cfg-if", "generator", @@ -1487,6 +1487,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "nu-ansi-term" +version = "0.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" +dependencies = [ + "windows-sys", +] + [[package]] name = "num-bigint" version = "0.4.4" @@ -1576,6 +1585,15 @@ name = "ordered-float" version = "3.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" +dependencies = [ + "num-traits", +] + +[[package]] +name = "ordered-float" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "536900a8093134cf9ccf00a27deb3532421099e958d9dd431135d0c7543ca1e8" dependencies = [ "arbitrary", "num-traits", @@ -1838,6 +1856,16 @@ dependencies = [ "getrandom", ] +[[package]] +name = "rand_distr" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +dependencies = [ + "num-traits", + "rand", +] + [[package]] name = "raw-cpuid" version = "10.7.0" @@ -2190,7 +2218,7 @@ dependencies = [ "chrono", "derivative", "inherent", - "ordered-float", + "ordered-float 3.9.2", "rust_decimal", "sea-query-derive", "serde_json", @@ -2906,9 +2934,9 @@ dependencies = [ [[package]] name = "tracing-stackdriver" -version = "0.6.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff9dd91761e07727176a3dd3a1d64bbb577ea656b7b82fa4be4021832674c49" +checksum = "644201289b078e925ad49bfdeb7c0ced851d211462376d5154b13ce7be899afa" dependencies = [ "Inflector", "serde", @@ -2926,7 +2954,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ "matchers", - "nu-ansi-term", + "nu-ansi-term 0.46.0", "once_cell", "regex", "serde", diff --git a/packages/backend/storage/Cargo.toml b/packages/backend/storage/Cargo.toml index 6b5c685e37..7ccff97bdd 100644 --- a/packages/backend/storage/Cargo.toml +++ b/packages/backend/storage/Cargo.toml @@ -8,9 +8,9 @@ crate-type = ["cdylib"] [dependencies] chrono = "0.4" -jwst-codec = { git = "https://github.com/toeverything/OctoBase.git", rev = "ad51b2c" } -jwst-core = { git = "https://github.com/toeverything/OctoBase.git", rev = "ad51b2c" } -jwst-storage = { git = "https://github.com/toeverything/OctoBase.git", rev = "ad51b2c" } +jwst-codec = { git = "https://github.com/toeverything/OctoBase.git", rev = "aad9e5b" } +jwst-core = { git = "https://github.com/toeverything/OctoBase.git", rev = "aad9e5b" } +jwst-storage = { git = "https://github.com/toeverything/OctoBase.git", rev = "aad9e5b" } napi = { version = "2", default-features = false, features = [ "napi5", "async", diff --git a/packages/frontend/native/Cargo.toml b/packages/frontend/native/Cargo.toml index d0e93c3293..443fdd3f70 100644 --- a/packages/frontend/native/Cargo.toml +++ b/packages/frontend/native/Cargo.toml @@ -25,7 +25,7 @@ rand = "0.8" serde = "1" serde_json = "1" sha3 = "0.10" -sqlx = { version = "0.7.1", default-features = false, features = [ +sqlx = { version = "0.7.2", default-features = false, features = [ "sqlite", "migrate", "runtime-tokio", @@ -44,7 +44,7 @@ uuid = { version = "1", default-features = false, features = [ affine_schema = { path = "./schema" } dotenv = "0.15" napi-build = "2" -sqlx = { version = "0.7.1", default-features = false, features = [ +sqlx = { version = "0.7.2", default-features = false, features = [ "sqlite", "runtime-tokio", "tls-rustls",