Skip to content

Commit

Permalink
feat: Patch deno core to remove preserve_order
Browse files Browse the repository at this point in the history
  • Loading branch information
@bakjos
bakjos committed Mar 31, 2024
1 parent 1f627c9 commit d562baf
Show file tree
Hide file tree
Showing 4 changed files with 89 additions and 19 deletions.
23 changes: 16 additions & 7 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,8 @@ futures-timer = { git = "https://github.com/madsim-rs/futures-timer.git", rev =
etcd-client = { git = "https://github.com/risingwavelabs/etcd-client.git", rev = "4e84d40" }
# todo(wcy-fdu): remove this patch fork after opendal release a new version to apply azure workload identity change.
reqsign = { git = "https://github.com/wcy-fdu/reqsign.git", rev = "e6cb304" }
# patch to remove preserve_order from serde_json
deno_core = { git = "https://github.com/bakjos/deno_core", rev = "70d1544" }

[workspace.metadata.dylint]
libraries = [{ path = "./lints" }]
2 changes: 0 additions & 2 deletions src/connector/src/sink/encoder/json.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -855,8 +855,6 @@ mod tests {
["schema"]
.to_string();
let ans = r#"{"fields":[{"field":"v1","optional":true,"type":"boolean"},{"field":"v2","optional":true,"type":"int16"},{"field":"v3","optional":true,"type":"int32"},{"field":"v4","optional":true,"type":"float"},{"field":"v5","optional":true,"type":"string"},{"field":"v6","optional":true,"type":"int32"},{"field":"v7","optional":true,"type":"string"},{"field":"v8","optional":true,"type":"int64"},{"field":"v9","optional":true,"type":"string"},{"field":"v10","fields":[{"field":"a","optional":true,"type":"int64"},{"field":"b","optional":true,"type":"string"},{"field":"c","fields":[{"field":"aa","optional":true,"type":"int64"},{"field":"bb","optional":true,"type":"double"}],"optional":true,"type":"struct"}],"optional":true,"type":"struct"},{"field":"v11","items":{"items":{"fields":[{"field":"aa","optional":true,"type":"int64"},{"field":"bb","optional":true,"type":"double"}],"optional":true,"type":"struct"},"optional":true,"type":"array"},"optional":true,"type":"array"},{"field":"12","optional":true,"type":"string"},{"field":"13","optional":true,"type":"int32"},{"field":"14","optional":true,"type":"string"}],"name":"test","optional":false,"type":"struct"}"#;
let schema = serde_json::from_str::<Value>(&schema).unwrap();
let ans = serde_json::from_str::<Value>(ans).unwrap();
assert_eq!(schema, ans);
}
}
81 changes: 71 additions & 10 deletions src/workspace-hack/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ aws-smithy-types = { version = "1", default-features = false, features = ["byte-
axum = { version = "0.6" }
base64 = { version = "0.21" }
bigdecimal = { version = "0.4" }
bit-set = { version = "0.5" }
bit-vec = { version = "0.6" }
bitflags = { version = "2", default-features = false, features = ["serde", "std"] }
brotli = { version = "3" }
byteorder = { version = "1" }
bytes = { version = "1", features = ["serde"] }
chrono = { version = "0.4", features = ["serde"] }
Expand All @@ -44,9 +46,13 @@ crossbeam-epoch = { version = "0.9" }
crossbeam-queue = { version = "0.3" }
crossbeam-utils = { version = "0.8" }
crypto-bigint = { version = "0.5", features = ["generic-array", "zeroize"] }
crypto-common = { version = "0.1", default-features = false, features = ["getrandom", "std"] }
curve25519-dalek = { version = "4", features = ["digest"] }
debugid = { version = "0.8", default-features = false, features = ["serde"] }
deranged = { version = "0.3", default-features = false, features = ["powerfmt", "serde", "std"] }
digest = { version = "0.10", features = ["mac", "oid", "std"] }
either = { version = "1", features = ["serde"] }
elliptic-curve = { version = "0.13", features = ["ecdh", "hazmat", "pem", "std"] }
fail = { version = "0.5", default-features = false, features = ["failpoints"] }
flate2 = { version = "1", features = ["zlib"] }
flume = { version = "0.10" }
Expand Down Expand Up @@ -87,17 +93,19 @@ memchr = { version = "2" }
mio = { version = "0.8", features = ["net", "os-ext"] }
moka = { version = "0.12", features = ["future", "sync"] }
nom = { version = "7" }
num-bigint = { version = "0.4" }
num-bigint = { version = "0.4", features = ["rand", "serde"] }
num-bigint-dig = { version = "0.8", default-features = false, features = ["i128", "prime", "u64_digit", "zeroize"] }
num-integer = { version = "0.1", features = ["i128"] }
num-iter = { version = "0.1", default-features = false, features = ["i128", "std"] }
num-traits = { version = "0.2", features = ["i128", "libm"] }
openssl = { version = "0.10", features = ["vendored"] }
openssl-sys = { version = "0.9", default-features = false, features = ["vendored"] }
ordered-float = { version = "3" }
p256 = { version = "0.13", features = ["ecdh"] }
parking_lot = { version = "0.12", features = ["arc_lock", "deadlock_detection"] }
parking_lot_core = { version = "0.9", default-features = false, features = ["deadlock_detection"] }
petgraph = { version = "0.6" }
phf = { version = "0.11", features = ["uncased"] }
phf = { version = "0.11", features = ["macros", "uncased"] }
phf_shared = { version = "0.11", features = ["uncased"] }
postgres-types = { version = "0.2", default-features = false, features = ["derive", "with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
proc-macro2 = { version = "1", features = ["span-locations"] }
Expand All @@ -112,20 +120,25 @@ redis = { version = "0.25", features = ["async-std-comp", "tokio-comp"] }
regex = { version = "1" }
regex-automata = { version = "0.4", default-features = false, features = ["dfa", "hybrid", "meta", "nfa", "perf", "unicode"] }
regex-syntax = { version = "0.8" }
reqwest = { version = "0.11", features = ["blocking", "json", "rustls-tls"] }
ring = { version = "0.16", features = ["std"] }
reqwest = { version = "0.11", features = ["blocking", "brotli", "gzip", "json", "rustls-tls", "socks", "stream"] }
ring-9067fe90e8c1f593 = { package = "ring", version = "0.17", features = ["std"] }
ring-986da7b5efc2b80e = { package = "ring", version = "0.16", features = ["std"] }
rsa = { version = "0.9", features = ["hazmat"] }
rust_decimal = { version = "1", features = ["db-postgres", "maths"] }
rustc-hash = { version = "1" }
rustls = { version = "0.21", features = ["dangerous_configuration"] }
scopeguard = { version = "1" }
sea-orm = { version = "0.12", features = ["runtime-tokio-native-tls", "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite"] }
sea-query = { version = "0.30", default-features = false, features = ["backend-mysql", "backend-postgres", "backend-sqlite", "derive", "hashable-value", "postgres-array", "thread-safe", "with-bigdecimal", "with-chrono", "with-json", "with-rust_decimal", "with-time", "with-uuid"] }
sea-query-binder = { version = "0.5", default-features = false, features = ["postgres-array", "runtime-tokio-native-tls", "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", "with-bigdecimal", "with-chrono", "with-json", "with-rust_decimal", "with-time", "with-uuid"] }
serde = { version = "1", features = ["alloc", "derive", "rc"] }
serde_json = { version = "1", features = ["alloc", "raw_value"] }
serde_with = { version = "3", features = ["json"] }
sha1 = { version = "0.10" }
sha1 = { version = "0.10", features = ["oid"] }
sha2 = { version = "0.10", features = ["oid"] }
simdutf8 = { version = "0.1", features = ["aarch64_neon", "public_imp"] }
smallvec = { version = "1", default-features = false, features = ["const_new", "serde", "union", "write"] }
socket2 = { version = "0.5", default-features = false, features = ["all"] }
sqlx = { version = "0.7", default-features = false, features = ["bigdecimal", "chrono", "json", "mysql", "postgres", "runtime-tokio-native-tls", "rust_decimal", "sqlite", "time", "uuid"] }
sqlx-core = { version = "0.7", features = ["_rt-tokio", "_tls-native-tls", "bigdecimal", "chrono", "json", "migrate", "offline", "rust_decimal", "time", "uuid"] }
sqlx-mysql = { version = "0.7", default-features = false, features = ["bigdecimal", "chrono", "json", "rust_decimal", "time", "uuid"] }
Expand All @@ -134,6 +147,7 @@ sqlx-sqlite = { version = "0.7", default-features = false, features = ["chrono",
strum = { version = "0.25", features = ["derive"] }
subtle = { version = "2" }
syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["extra-traits", "full", "visit", "visit-mut"] }
syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
target-lexicon = { version = "0.12", features = ["std"] }
time = { version = "0.3", features = ["local-offset", "macros", "serde-well-known"] }
tinyvec = { version = "1", features = ["alloc", "grab_spare_slice", "rustc_1_55"] }
Expand All @@ -149,42 +163,70 @@ tracing-core = { version = "0.1" }
tracing-subscriber = { version = "0.3", features = ["env-filter", "json", "local-time", "parking_lot"] }
unicode-bidi = { version = "0.3" }
unicode-normalization = { version = "0.1" }
url = { version = "2", features = ["serde"] }
url = { version = "2", features = ["expose_internals", "serde"] }
uuid = { version = "1", features = ["fast-rng", "serde", "v4"] }
whoami = { version = "1" }
zeroize = { version = "1" }
zeroize = { version = "1", features = ["zeroize_derive"] }

[build-dependencies]
ahash = { version = "0.8" }
aho-corasick = { version = "1" }
allocator-api2 = { version = "0.2", default-features = false, features = ["alloc", "nightly"] }
anyhow = { version = "1", features = ["backtrace"] }
auto_enums = { version = "0.8", features = ["futures03", "tokio1"] }
base64 = { version = "0.21" }
bit-set = { version = "0.5" }
bit-vec = { version = "0.6" }
bitflags = { version = "2", default-features = false, features = ["serde", "std"] }
brotli = { version = "3" }
byteorder = { version = "1" }
bytes = { version = "1", features = ["serde"] }
cc = { version = "1", default-features = false, features = ["parallel"] }
crossbeam-epoch = { version = "0.9" }
crossbeam-queue = { version = "0.3" }
crossbeam-utils = { version = "0.8" }
crypto-bigint = { version = "0.5", features = ["generic-array", "zeroize"] }
crypto-common = { version = "0.1", default-features = false, features = ["getrandom", "std"] }
curve25519-dalek = { version = "4", features = ["digest"] }
debugid = { version = "0.8", default-features = false, features = ["serde"] }
deranged = { version = "0.3", default-features = false, features = ["powerfmt", "serde", "std"] }
digest = { version = "0.10", features = ["mac", "oid", "std"] }
either = { version = "1", features = ["serde"] }
elliptic-curve = { version = "0.13", features = ["ecdh", "hazmat", "pem", "std"] }
flate2 = { version = "1", features = ["zlib"] }
frunk_core = { version = "0.4", default-features = false, features = ["std"] }
futures = { version = "0.3" }
futures-channel = { version = "0.3", features = ["sink"] }
futures-core = { version = "0.3" }
futures-executor = { version = "0.3" }
futures-io = { version = "0.3" }
futures-sink = { version = "0.3" }
futures-task = { version = "0.3" }
futures-util = { version = "0.3", features = ["channel", "io", "sink"] }
generic-array = { version = "0.14", default-features = false, features = ["more_lengths", "zeroize"] }
getrandom = { git = "https://github.com/madsim-rs/getrandom.git", rev = "e79a7ae", default-features = false, features = ["js", "rdrand", "std"] }
hashbrown-582f2526e08bb6a0 = { package = "hashbrown", version = "0.14", features = ["nightly", "raw"] }
hmac = { version = "0.12", default-features = false, features = ["reset"] }
hyper = { version = "0.14", features = ["full"] }
indexmap-f595c2ba2a3f28df = { package = "indexmap", version = "2", features = ["serde"] }
itertools = { version = "0.11" }
lazy_static = { version = "1", default-features = false, features = ["spin_no_std"] }
libc = { version = "0.2", features = ["extra_traits"] }
lock_api = { version = "0.4", features = ["arc_lock"] }
log = { version = "0.4", default-features = false, features = ["kv_unstable", "std"] }
memchr = { version = "2" }
mio = { version = "0.8", features = ["net", "os-ext"] }
nom = { version = "7" }
num-bigint = { version = "0.4" }
num-bigint = { version = "0.4", features = ["rand", "serde"] }
num-bigint-dig = { version = "0.8", default-features = false, features = ["i128", "prime", "u64_digit", "zeroize"] }
num-integer = { version = "0.1", features = ["i128"] }
num-iter = { version = "0.1", default-features = false, features = ["i128", "std"] }
num-traits = { version = "0.2", features = ["i128", "libm"] }
p256 = { version = "0.13", features = ["ecdh"] }
parking_lot = { version = "0.12", features = ["arc_lock", "deadlock_detection"] }
parking_lot_core = { version = "0.9", default-features = false, features = ["deadlock_detection"] }
petgraph = { version = "0.6" }
phf = { version = "0.11", features = ["uncased"] }
phf = { version = "0.11", features = ["macros", "uncased"] }
phf_shared = { version = "0.11", features = ["uncased"] }
proc-macro2 = { version = "1", features = ["span-locations"] }
prost = { version = "0.12", features = ["no-recursion-limit"] }
Expand All @@ -196,18 +238,37 @@ rand_core = { version = "0.6", default-features = false, features = ["std"] }
regex = { version = "1" }
regex-automata = { version = "0.4", default-features = false, features = ["dfa", "hybrid", "meta", "nfa", "perf", "unicode"] }
regex-syntax = { version = "0.8" }
reqwest = { version = "0.11", features = ["blocking", "brotli", "gzip", "json", "rustls-tls", "socks", "stream"] }
ring-9067fe90e8c1f593 = { package = "ring", version = "0.17", features = ["std"] }
ring-986da7b5efc2b80e = { package = "ring", version = "0.16", features = ["std"] }
rsa = { version = "0.9", features = ["hazmat"] }
rustc-hash = { version = "1" }
rustls = { version = "0.21", features = ["dangerous_configuration"] }
scopeguard = { version = "1" }
serde = { version = "1", features = ["alloc", "derive", "rc"] }
serde_json = { version = "1", features = ["alloc", "raw_value"] }
sha1 = { version = "0.10", features = ["oid"] }
sha2 = { version = "0.10", features = ["oid"] }
simdutf8 = { version = "0.1", features = ["aarch64_neon", "public_imp"] }
smallvec = { version = "1", default-features = false, features = ["const_new", "serde", "union", "write"] }
socket2 = { version = "0.5", default-features = false, features = ["all"] }
strum = { version = "0.25", features = ["derive"] }
subtle = { version = "2" }
syn-dff4ba8e3ae991db = { package = "syn", version = "1", features = ["extra-traits", "full", "visit", "visit-mut"] }
syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
target-lexicon = { version = "0.12", features = ["std"] }
time = { version = "0.3", features = ["local-offset", "macros", "serde-well-known"] }
time-macros = { version = "0.2", default-features = false, features = ["formatting", "parsing", "serde"] }
tinyvec = { version = "1", features = ["alloc", "grab_spare_slice", "rustc_1_55"] }
tokio = { version = "1", features = ["full", "tracing"] }
tokio-util = { version = "0.7", features = ["codec", "io"] }
toml_datetime = { version = "0.6", default-features = false, features = ["serde"] }
zeroize = { version = "1" }
tracing = { version = "0.1", features = ["log"] }
tracing-core = { version = "0.1" }
unicode-bidi = { version = "0.3" }
unicode-normalization = { version = "0.1" }
url = { version = "2", features = ["expose_internals", "serde"] }
uuid = { version = "1", features = ["fast-rng", "serde", "v4"] }
zeroize = { version = "1", features = ["zeroize_derive"] }

### END HAKARI SECTION

0 comments on commit d562baf

Please sign in to comment.