noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update third-party dependencies (#3005)

Browse source
This commit is contained in:
Gerard Guillemas Martos 2023-11-20 16:50:37 +01:00 committed by GitHub
parent 5da77aa1ef
commit 2584970b1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 2312 additions and 1950 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.cargo/audit.toml Normal file
View file

@ -0,0 +1,5 @@
[advisories]
ignore = [
# Acknowledged in: https://github.com/surrealdb/surrealdb/pull/3005
"RUSTSEC-2021-0127"
]

2267
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

45
Cargo.toml
View file

@ -34,48 +34,47 @@ codegen-units = 1
strip = false
[dependencies]
argon2 = "0.5.1"
argon2 = "0.5.2"
axum = { version = "0.6.20", features = ["tracing", "ws", "headers"] }
axum-client-ip = "0.4.1"
axum-client-ip = "0.4.2"
axum-extra = { version = "0.7.7", features = ["query", "typed-routing"] }
axum-server = { version = "0.5.1", features = ["tls-rustls"] }
base64 = "0.21.2"
bytes = "1.4.0"
clap = { version = "4.3.21", features = ["env", "derive", "wrap_help", "unicode"] }
futures = "0.3.28"
futures-util = "0.3.28"
base64 = "0.21.5"
bytes = "1.5.0"
clap = { version = "4.4.7", features = ["env", "derive", "wrap_help", "unicode"] }
futures = "0.3.29"
futures-util = "0.3.29"
glob = "0.3.1"
http = "0.2.9"
http-body = "0.4.5"
hyper = "0.14.27"
ipnet = "2.8.0"
ipnet = "2.9.0"
once_cell = "1.18.0"
opentelemetry = { version = "0.19", features = ["rt-tokio"] }
opentelemetry-otlp = { version = "0.12.0", features = ["metrics"] }
pin-project-lite = "0.2.12"
pin-project-lite = "0.2.13"
rand = "0.8.5"
reqwest = { version = "0.11.18", default-features = false, features = ["blocking", "gzip"] }
reqwest = { version = "0.11.22", default-features = false, features = ["blocking", "gzip"] }
rustyline = { version = "11.0.0", features = ["derive"] }
serde = { version = "1.0.183", features = ["derive"] }
serde = { version = "1.0.190", features = ["derive"] }
serde_cbor = "0.11.2"
serde_json = "1.0.104"
serde_json = "1.0.108"
serde_pack = { version = "1.1.2", package = "rmp-serde" }
surrealdb = { path = "lib", features = ["protocol-http", "protocol-ws", "rustls"] }
tempfile = "3.7.1"
thiserror = "1.0.44"
tokio = { version = "1.31.0", features = ["macros", "signal"] }
tokio-util = { version = "0.7.8", features = ["io"] }
tempfile = "3.8.1"
thiserror = "1.0.50"
tokio = { version = "1.33.0", features = ["macros", "signal"] }
tokio-util = { version = "0.7.10", features = ["io"] }
tower = "0.4.13"
tower-http = { version = "0.4.3", features = ["trace", "sensitive-headers", "auth", "request-id", "util", "catch-panic", "cors", "set-header", "limit", "add-extension", "compression-full"] }
tower-http = { version = "0.4.4", features = ["trace", "sensitive-headers", "auth", "request-id", "util", "catch-panic", "cors", "set-header", "limit", "add-extension", "compression-full"] }
tracing = "0.1"
tracing-futures = { version = "0.2.5", features = ["tokio"], default-features = false }
tracing-opentelemetry = "0.19.0"
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
urlencoding = "2.1.3"
uuid = { version = "1.4.1", features = ["serde", "js", "v4", "v7"] }
uuid = { version = "1.6.1", features = ["serde", "js", "v4", "v7"] }
[target.'cfg(unix)'.dependencies]
nix = "0.26.2"
nix = "0.26.4"
[dev-dependencies]
assert_fs = "1.0.13"
@ -83,10 +82,10 @@ env_logger = "0.10.0"
opentelemetry-proto = { version = "0.2.0", features = ["gen-tonic", "traces", "metrics", "logs"] }
rcgen = "0.10.0"
serial_test = "2.0.0"
temp-env = { version = "0.3.4", features = ["async_closure"] }
test-log = { version = "0.2.12", features = ["trace"] }
temp-env = { version = "0.3.6", features = ["async_closure"] }
test-log = { version = "0.2.13", features = ["trace"] }
tokio-stream = { version = "0.1", features = ["net"] }
tokio-tungstenite = { version = "0.18.0" }
tokio-tungstenite = { version = "0.20.1" }
tonic = "0.8.3"
ulid = "1.1.0"
wiremock = "0.5.19"

70
lib/Cargo.toml
View file

@ -52,95 +52,95 @@ targets = []
[dependencies]
addr = { version = "0.15.6", default-features = false, features = ["std"] }
argon2 = "0.5.1"
argon2 = "0.5.2"
ascii = { version = "0.3.2", package = "any_ascii" }
async-recursion = "1.0.4"
base64_lib = { version = "0.21.2", package = "base64" }
async-recursion = "1.0.5"
base64_lib = { version = "0.21.5", package = "base64" }
bcrypt = "0.14.0"
bincode = "1.3.3"
bytes = "1.4.0"
cedar-policy = "2.3.2"
bytes = "1.5.0"
cedar-policy = "2.4.2"
channel = { version = "1.9.0", package = "async-channel" }
chrono = { version = "0.4.26", features = ["serde"] }
chrono = { version = "0.4.31", features = ["serde"] }
derive = { version = "0.12.0", package = "surrealdb-derive" }
deunicode = "1.3.3"
deunicode = "1.4.1"
distances = "1.6.2"
dmp = "0.2.0"
echodb = { version = "0.4.0", optional = true }
executor = { version = "1.5.1", package = "async-executor" }
executor = { version = "1.6.0", package = "async-executor" }
flume = "0.10.14"
foundationdb = { version = "0.8.0", default-features = false, features = ["embedded-fdb-include"], optional = true }
fst = "0.4.7"
futures = "0.3.28"
futures-concurrency = "7.3.0"
futures = "0.3.29"
futures-concurrency = "7.4.3"
fuzzy-matcher = "0.3.7"
geo = { version = "0.25.1", features = ["use-serde"] }
indexmap = { version = "1.9.3", features = ["serde"] }
indxdb = { version = "0.3.0", optional = true }
ipnet = "2.8.0"
ipnet = "2.9.0"
js = { version = "=0.4.0-beta.4", package = "rquickjs", features = ["array-buffer", "bindgen", "classes", "futures", "loader", "macro", "parallel", "properties","rust-alloc"], optional = true }
jsonwebtoken = { version = "8.3.0-surreal.1", package = "surrealdb-jsonwebtoken" }
lexicmp = "0.1.0"
lru = "0.10.1"
md-5 = "0.10.5"
md-5 = "0.10.6"
nanoid = "0.4.0"
native-tls = { version = "0.2.11", optional = true }
nom = { version = "7.1.3", features = ["alloc"] }
once_cell = "1.18.0"
path-clean = "1.0.1"
pbkdf2 = { version = "0.12.2", features = ["simple"] }
pin-project-lite = "0.2.12"
pin-project-lite = "0.2.13"
radix_trie = { version = "0.2.1", features = ["serde"] }
rand = "0.8.5"
regex = "1.9.3"
reqwest = { version = "0.11.18", default-features = false, features = ["json", "stream", "multipart"], optional = true }
regex = "1.10.2"
reqwest = { version = "0.11.22", default-features = false, features = ["json", "stream", "multipart"], optional = true }
revision = "0.5.0"
roaring = { version = "0.10.2", features = ["serde"] }
rocksdb = { version = "0.21.0", optional = true }
rust_decimal = { version = "1.31.0", features = ["maths", "serde-str"] }
rust_decimal = { version = "1.32.0", features = ["maths", "serde-str"] }
rust-stemmers = "1.2.0"
rustls = { version = "0.21.6", optional = true }
rustls = { version = "=0.21.6", optional = true }
scrypt = "0.11.0"
semver = { version = "1.0.18", features = ["serde"] }
serde = { version = "1.0.183", features = ["derive"] }
serde_json = "1.0.104"
semver = { version = "1.0.20", features = ["serde"] }
serde = { version = "1.0.190", features = ["derive"] }
serde_json = "1.0.108"
sha1 = "0.10.6"
sha2 = "0.10.7"
sha2 = "0.10.8"
snap = "1.1.0"
speedb = { version = "0.0.2", optional = true }
storekey = "0.5.0"
thiserror = "1.0.44"
thiserror = "1.0.50"
tikv = { version = "0.2.0-surreal.2", default-features = false, package = "surrealdb-tikv-client", optional = true }
tokio-util = { version = "0.7.8", optional = true, features = ["compat"] }
tracing = "0.1.37"
tokio-util = { version = "0.7.10", optional = true, features = ["compat"] }
tracing = "0.1.40"
trice = "0.3.1"
ulid = { version = "1.0.0", features = ["serde"] }
url = "2.4.0"
ulid = { version = "1.1.0", features = ["serde"] }
url = "2.4.1"
[dev-dependencies]
criterion = { version="0.4", features= ["async_tokio"] }
criterion = { version="0.5.1", features= ["async_tokio"] }
env_logger = "0.10.0"
pprof = { version = "0.11.1", features = ["flamegraph", "criterion"] }
pprof = { version = "0.13.0", features = ["flamegraph", "criterion"] }
serial_test = "2.0.0"
temp-dir = "0.1.11"
test-log = { version="0.2.12", features = ["trace"] }
time = { version = "0.3.25", features = ["serde"] }
tokio = { version = "1.31.0", features = ["macros", "sync", "rt-multi-thread"] }
test-log = { version="0.2.13", features = ["trace"] }
time = { version = "0.3.30", features = ["serde"] }
tokio = { version = "1.33.0", features = ["macros", "sync", "rt-multi-thread"] }
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
wiremock = "0.5.19"
[target.'cfg(target_arch = "wasm32")'.dependencies]
pharos = "0.5.3"
tokio = { version = "1.31.0", default-features = false, features = ["rt", "sync"] }
uuid = { version = "1.4.1", features = ["serde", "js", "v4", "v7"] }
tokio = { version = "1.33.0", default-features = false, features = ["rt", "sync"] }
uuid = { version = "1.6.1", features = ["serde", "js", "v4", "v7"] }
wasm-bindgen-futures = "0.4.37"
wasmtimer = { version = "0.2.0", default-features = false, features = ["tokio"] }
ws_stream_wasm = "0.7.4"
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1.31.0", default-features = false, features = ["macros", "io-util", "io-std", "fs", "rt-multi-thread", "time", "sync"] }
tokio = { version = "1.33.0", default-features = false, features = ["macros", "io-util", "io-std", "fs", "rt-multi-thread", "time", "sync"] }
tokio-tungstenite = { version = "0.20.1", optional = true }
uuid = { version = "1.4.1", features = ["serde", "v4", "v7"] }
uuid = { version = "1.6.1", features = ["serde", "v4", "v7"] }
[lib]
bench = false

1861
lib/fuzz/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

8
lib/fuzz/Cargo.toml
View file

@ -8,10 +8,10 @@ edition = "2021"
cargo-fuzz = true
[dependencies]
libfuzzer-sys = { version= "0.4", features = ["arbitrary-derive"] }
arbitrary = { version = "1", features = ["derive"] }
futures = "0.3.28"
tokio = "1.27.0"
libfuzzer-sys = { version= "0.4.7", features = ["arbitrary-derive"] }
arbitrary = { version = "1.3.2", features = ["derive"] }
futures = "0.3.29"
tokio = "1.33.0"
[dependencies.surrealdb]
path = ".."

4
lib/src/fnc/time.rs
View file

@ -148,8 +148,8 @@ pub fn month((val,): (Option<Datetime>,)) -> Result<Value, Error> {
pub fn nano((val,): (Option<Datetime>,)) -> Result<Value, Error> {
Ok(match val {
Some(v) => v.timestamp_nanos().into(),
None => Datetime::default().timestamp_nanos().into(),
Some(v) => v.timestamp_nanos_opt().unwrap_or_default().into(),
None => Datetime::default().timestamp_nanos_opt().unwrap_or_default().into(),
})
}

2
src/rpc/connection.rs
View file

@ -7,8 +7,8 @@ use std::collections::BTreeMap;
use std::sync::Arc;
use surrealdb::channel::{self, Receiver, Sender};
use tokio::sync::RwLock;
use tracing::Instrument;
use tracing::Span;
use tracing_futures::Instrument;
use surrealdb::dbs::Session;
use tokio::task::JoinSet;