Skip to content

Commit 073ad61

Browse files
eastspireeastspire
authored
Upgrade hyperlane v9.4.4 (#10112)
* feat: lock * feat: lock * feat: db * feat: db * feat: db * feat: db * feat: db * feat: db * feat: db * feat: db * feat: rand * feat: rand * feat: rand * feat: rand * feat: rand * feat: port * feat: port * feat: port * feat: db * feat: db * feat: db * feat: lock * feat: lock * feat: v4.41.0 * feat: v4.42.0 * Merge remote-tracking branch 'upstream/master' * Merge remote-tracking branch 'upstream/master' * feat: inline * feat: dockerfile * feat: v4.52.1 * feat: remove key * remove: log * remove: log * feat: async * remove: empty loop * feat: utf8 * change: pool_size * remove: utf8 * feat: log * feat: log * feat: v3.14.1 * feat: 4.56.3 * feat: 4.56.4 * feat: 4.56.5 * feat: rename * Merge branch 'master' of github.com:TechEmpower/FrameworkBenchmarks * feat: speed * feat: speed * lock: toml * lock: toml * lock: toml * lock: toml * lock: toml * lock: toml * lock: toml * lock: toml * lock: toml * lock: toml * lock: toml * lock: toml * lock: toml * feat: runtime * feat: runtime * feat: runtime * lock: toml * lock: toml * lock: toml * lock: toml * lock: toml * lock: toml * lock: toml * lock: toml * feat: update * Merge remote-tracking branch 'upstream/master' * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * Merge remote-tracking branch 'upstream/master' * feat: hyperlane * feat: update * docs: readme * feat: update * Merge remote-tracking branch 'upstream/master' * feat: update * feat: update * feat: update * Merge remote-tracking branch 'upstream/master' * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: lock * feat: use super * feat: update lock * feat: update * feat: update lock * feat: update lock * feat: update lock * feat: lock * feat: update lock * feat: update lock * feat: update lock * feat: update lock * feat: update lock * feat: update lock * feat: update lock * feat: update lock * feat: update lock * feat: update lock * feat: update lock * feat: update lock * feat: update lock * Merge remote-tracking branch 'upstream/master' * feat: update * feat: utf8 * feat: utf8 * feat: lock * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * update: code * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * feat: update * Merge remote-tracking branch 'upstream/master' * feat: update version * feat: update version * update: code * Merge remote-tracking branch 'upstream/master' * feat: lock * feat: lock * feat: lock * feat: lock * feat: lock * feat: lock * feat: lock * feat: error handle * feat: dep * feat: get_thread_count * update: code * feat: lock * feat: speed * feat: speed * update: code * feat: speed * update: code * feat: lock * fix: Framework hyperlane does not define a default test in benchmark_config.json * feat: hyperlane http version * feat: hyperlane http version * feat: toml * feat: toml * feat: toml * feat: toml * feat: v0.1.0 * feat: toml * feat: v6 * feat: v6 * feat: v6 * feat: v6 * feat: v6 * debug: test cache * debug: test cache * feat: v6 * feat: send unwrap * feat: v6 * feat: v6 * feat: v0.1.0 * feat: toml * feat: toml * feat: db * feat: toml * feat: toml * feat: toml * feat: toml * feat: dir update * feat: toml * feat: toml * feat: toml * feat: toml * feat: toml * feat: toml * feat: toml * feat: toml * feat: toml * feat: toml * feat: toml --------- Co-authored-by: 尤雨东 <[email protected]>
1 parent 2481f23 commit 073ad61

File tree

6 files changed

+57
-65
lines changed

6 files changed

+57
-65
lines changed

‎frameworks/Rust/hyperlane/Cargo.lock‎

Lines changed: 25 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎frameworks/Rust/hyperlane/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ exclude = [
2020

2121
[dependencies]
2222
futures = "0.3.31"
23-
hyperlane = "8.1.2"
23+
hyperlane = "9.4.4"
2424
hyperlane-time = "0.7.8"
2525
num_cpus = "1.17.0"
2626
once_cell = "1.21.3"
2727
rand = "0.9.2"
28-
serde = "1.0.219"
29-
serde_json = "1.0.143"
28+
serde = "1.0.223"
29+
serde_json = "1.0.145"
3030
sqlx = { version = "0.8.6", features = ["runtime-tokio", "postgres"] }
3131

3232
[profile.dev]

‎frameworks/Rust/hyperlane/hyperlane.default.dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rust:1.85
1+
FROM rust:1.89
22

33
RUN apt-get update -yqq && apt-get install -yqq cmake g++ binutils lld
44

‎frameworks/Rust/hyperlane/src/middleware/fn.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pub async fn request(ctx: Context) {
77
.await
88
.set_response_header(SERVER, HYPERLANE)
99
.await
10-
.set_response_header(DATE, gmt())
10+
.set_response_header(DATE, &gmt())
1111
.await
1212
.set_response_status_code(200)
1313
.await

‎frameworks/Rust/hyperlane/src/route/fn.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pub async fn json(ctx: Context) {
55
"message": RESPONSEDATA_STR
66
});
77
let run = || async {
8-
ctx.set_response_body(serde_json::to_string(&json).unwrap_or_default())
8+
ctx.set_response_body(&serde_json::to_vec(&json).unwrap_or_default())
99
.await;
1010
ctx.send().await.unwrap();
1111
};
@@ -18,7 +18,7 @@ pub async fn json(ctx: Context) {
1818

1919
pub async fn plaintext(ctx: Context) {
2020
ctx.set_response_header(CONTENT_TYPE, TEXT_PLAIN).await;
21-
ctx.set_response_body(RESPONSEDATA_BIN).await;
21+
ctx.set_response_body(&RESPONSEDATA_BIN).await;
2222
let run = || async {
2323
ctx.send().await.unwrap();
2424
};
@@ -33,7 +33,7 @@ pub async fn db(ctx: Context) {
3333
let db_connection: &DbPoolConnection = get_db_connection();
3434
let run = || async {
3535
let query_row: QueryRow = random_world_row(db_connection).await;
36-
ctx.set_response_body(serde_json::to_string(&query_row).unwrap_or_default())
36+
ctx.set_response_body(&serde_json::to_vec(&query_row).unwrap_or_default())
3737
.await
3838
.send()
3939
.await
@@ -57,7 +57,7 @@ pub async fn query(ctx: Context) {
5757
.max(1);
5858
let db_pool: &DbPoolConnection = get_db_connection();
5959
let data: Vec<QueryRow> = get_some_row_id(queries, db_pool).await;
60-
ctx.set_response_body(serde_json::to_string(&data).unwrap_or_default())
60+
ctx.set_response_body(&serde_json::to_vec(&data).unwrap_or_default())
6161
.await
6262
.send()
6363
.await
@@ -73,7 +73,7 @@ pub async fn query(ctx: Context) {
7373
pub async fn fortunes(ctx: Context) {
7474
ctx.set_response_header(
7575
CONTENT_TYPE,
76-
ContentType::format_content_type_with_charset(TEXT_HTML, UTF8),
76+
&ContentType::format_content_type_with_charset(TEXT_HTML, UTF8),
7777
)
7878
.await;
7979
let run = || async {
@@ -92,7 +92,7 @@ pub async fn fortunes(ctx: Context) {
9292
));
9393
fortunes_list.sort_by(|it, next| it.message.cmp(&next.message));
9494
let res: String = FortunesTemplate::new(fortunes_list).to_string();
95-
ctx.set_response_body(res).await.send().await.unwrap();
95+
ctx.set_response_body(&res).await.send().await.unwrap();
9696
};
9797
run().await;
9898
while let Ok(_) = ctx.http_from_stream(HTTP_BUFFER).await {
@@ -111,7 +111,7 @@ pub async fn update(ctx: Context) {
111111
.min(ROW_LIMIT as Queries)
112112
.max(1);
113113
let res: Vec<QueryRow> = update_world_rows(queries).await;
114-
ctx.set_response_body(serde_json::to_string(&res).unwrap_or_default())
114+
ctx.set_response_body(&serde_json::to_vec(&res).unwrap_or_default())
115115
.await
116116
.send()
117117
.await
@@ -134,7 +134,7 @@ pub async fn cached_query(ctx: Context) {
134134
.min(ROW_LIMIT as Queries)
135135
.max(1);
136136
let res: Vec<&QueryRow> = CACHE.iter().take(count as usize).collect();
137-
ctx.set_response_body(serde_json::to_string(&res).unwrap_or_default())
137+
ctx.set_response_body(&serde_json::to_vec(&res).unwrap_or_default())
138138
.await
139139
.send()
140140
.await

‎frameworks/Rust/hyperlane/src/server/fn.rs‎

Lines changed: 19 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -13,59 +13,40 @@ fn runtime() -> Runtime {
1313

1414
async fn init_server() {
1515
let config: ServerConfig = ServerConfig::new().await;
16-
config.host("0.0.0.0").await;
17-
config.port(8080).await;
18-
config.disable_nodelay().await;
19-
config.http_buffer(256).await;
20-
config.ws_buffer(256).await;
21-
22-
let server: Server = Server::from(config).await;
23-
24-
server.request_middleware(middleware::request).await;
25-
26-
server
27-
.disable_http_hook("/plaintext")
16+
config
17+
.host("0.0.0.0")
2818
.await
29-
.route("/plaintext", route::plaintext)
19+
.port(8080)
20+
.await
21+
.disable_linger()
22+
.await
23+
.disable_nodelay()
24+
.await
25+
.buffer(256)
3026
.await;
31-
32-
server
33-
.disable_http_hook("/json")
27+
Server::from(config)
28+
.await
29+
.request_middleware(middleware::request)
30+
.await
31+
.route("/plaintext", route::plaintext)
3432
.await
3533
.route("/json", route::json)
36-
.await;
37-
38-
server
39-
.disable_http_hook("/cached-quer")
4034
.await
4135
.route("/cached-quer", route::cached_query)
42-
.await;
43-
44-
server
45-
.disable_http_hook("/db")
4636
.await
4737
.route("/db", route::db)
48-
.await;
49-
50-
server
51-
.disable_http_hook("/query")
5238
.await
5339
.route("/query", route::query)
54-
.await;
55-
56-
server
57-
.disable_http_hook("/fortunes")
5840
.await
5941
.route("/fortunes", route::fortunes)
60-
.await;
61-
62-
server
63-
.disable_http_hook("/upda")
6442
.await
6543
.route("/upda", route::update)
44+
.await
45+
.run()
46+
.await
47+
.unwrap()
48+
.wait()
6649
.await;
67-
68-
server.run().await.unwrap().wait().await;
6950
}
7051

7152
async fn init() {

0 commit comments

Comments
 (0)