Skip to content

Resolve url in WASI #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 26, 2022
Merged

Resolve url in WASI #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4d9410
Add support for WASI.
MediosZ Sep 25, 2022
337ecff
Resolve url in wasi.
MediosZ Sep 26, 2022
c8a7b3e
Merge branch 'master' into wasi
MediosZ Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions examples/crud/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ where
* Amount float
* Shipping float
* Tax float
* ShippingAddress string
* ShippingAddress string
*/

#[tokio::main(flavor = "current_thread")]
Expand All @@ -54,20 +54,23 @@ async fn main() -> Result<()> {
.collect::<String>()
.await?;
println!("create new table");
}
else{
} else {
// delete all data from the table.
println!("delete all from commerce");
let _ = conn.query_iter("DELETE FROM commerce;").await?;
}

// insert some data
let _ = conn.query_iter("INSERT INTO commerce VALUES
let _ = conn
.query_iter(
"INSERT INTO commerce VALUES
(1, 12, 2, 56.0, 15.0, 2.0, 'Mataderos 2312'),
(2, 15, 3, 256.0, 30.0, 16.0, '1234 NW Bobcat Lane'),
(3, 11, 5, 536.0, 50.0, 24.0, '20 Havelock'),
(4, 8, 8, 126.0, 20.0, 12.0, '224 Pandan Loop'),
(5, 24, 1, 46.0, 10.0, 2.0, 'No.10 Jalan Besar');").await?;
(5, 24, 1, 46.0, 10.0, 2.0, 'No.10 Jalan Besar');",
)
.await?;

// query data
let result = conn
Expand All @@ -79,7 +82,9 @@ async fn main() -> Result<()> {
dbg!(result);

// delete some data
let _ = conn.query_iter("DELETE FROM commerce WHERE OrderID=4;").await?;
let _ = conn
.query_iter("DELETE FROM commerce WHERE OrderID=4;")
.await?;
// query data
let result = conn
.query_iter("SELECT * from commerce;")
Expand All @@ -90,9 +95,13 @@ async fn main() -> Result<()> {
dbg!(result);

// update some data
let _ = conn.query_iter("UPDATE commerce
let _ = conn
.query_iter(
"UPDATE commerce
SET ShippingAddress = '8366 Elizabeth St.'
WHERE OrderID = 2;").await?;
WHERE OrderID = 2;",
)
.await?;
// query data
let result = conn
.query_iter("SELECT * from commerce;")
Expand Down
12 changes: 12 additions & 0 deletions src/io/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,19 @@ impl Stream {
TcpStream::connect((host.as_str(), *port)).await?
}
HostPortOrUrl::Url(url) => {
#[cfg(not(target_os = "wasi"))]
let addrs = url.socket_addrs(|| Some(DEFAULT_PORT))?;
#[cfg(target_os = "wasi")]
let mut addrs = wasmedge_wasi_socket::nslookup(
url.host_str().expect("Unable to get host"),
"http",
)
.unwrap();
#[cfg(target_os = "wasi")]
for addr in addrs.iter_mut() {
addr.set_port(url.port_or_known_default().expect("No port found in url"));
}

TcpStream::connect(&*addrs).await?
}
};
Expand Down