Skip to content

Commit 270aa3a

Browse files
authored
client: support default port (#88)
* client: support default port * docs: link README
1 parent e1d0cca commit 270aa3a

File tree

9 files changed

+92
-37
lines changed

9 files changed

+92
-37
lines changed

Cargo.lock

+71-28
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ Rust client library for HStreamDB.
1111

1212
This library is experimental and work in progress, please use the latest released version on [crates.io](https://crates.io/crates/hstreamdb).
1313

14-
| client library version | HStream server version |
15-
| ---------------------- | -------------------------- |
16-
| `v0.1.*` | >= `v0.9.4` && <= `v0.9.7` |
17-
| `v0.2.*` | >= `v0.9.4` && <= `v0.9.7` |
14+
| client library version | HStream server version |
15+
| ---------------------- | --------------------------- |
16+
| `v0.1.*` | >= `v0.9.4` && <= `v0.9.7` |
17+
| `v0.2.*` | >= `v0.9.4` && <= `v0.12.0` |
1818

1919

2020
## Example Usage

src/hstreamdb-pb/README.md

Whitespace-only changes.

src/hstreamdb-pb/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../README.md

src/hstreamdb/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ thiserror = "1.0.38"
1515
log = "0.4.17"
1616

1717
flate2 = "1.0.25"
18-
zstd = "0.11.2"
18+
zstd = "0.12.1"
1919

2020
num-bigint = "0.4.3"
2121
num-traits = "0.2.15"
@@ -35,5 +35,5 @@ workspace-hack = { version = "0.1", path = "../utils/workspace-hack" }
3535
hstreamdb-test-utils = { path = "../utils/hstreamdb-test-utils" }
3636

3737
anyhow = "1.0.68"
38-
env_logger = "0.9.3"
38+
env_logger = "0.10.0"
3939
rand = "0.8.5"

src/hstreamdb/README.md

Whitespace-only changes.

src/hstreamdb/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../README.md

src/hstreamdb/src/client.rs

+9-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,15 @@ impl Client {
3232
const HSTREAM_PREFIX: &str = "hstream";
3333
let server_url = server_url.into();
3434
let (url_scheme, url) = {
35-
let url = Url::parse(&server_url)?;
35+
let url = {
36+
let mut url = Url::parse(&server_url)?;
37+
if url.port().is_none() {
38+
url.set_port(Some(6570))
39+
.map_err(|()| common::Error::SetPortError(server_url.to_string()))?;
40+
}
41+
url
42+
};
43+
3644
if url.scheme() == HSTREAM_PREFIX {
3745
let url_scheme = if channel_provider_settings.client_tls_config.is_none() {
3846
"http"

src/hstreamdb/src/common.rs

+2
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ pub enum Error {
9494
BadArgument(String),
9595
#[error(transparent)]
9696
AppenderSendError(producer::SendError),
97+
#[error("the URL {0} is cannot-be-a-base, or does not have a host, or has the file scheme")]
98+
SetPortError(String),
9799
}
98100

99101
#[derive(Debug, thiserror::Error)]

src/utils/hstreamdb-test-utils/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2021"
55

66
[dependencies]
77
log = "0.4.17"
8-
env_logger = "0.9.3"
8+
env_logger = "0.10.0"
99

1010
anyhow = "1.0.68"
1111
rand = "0.8.5"

src/x/hstreamdb-erl-nifs/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ workspace-hack = { version = "0.1", path = "../../utils/workspace-hack" }
1111
hstreamdb = { path = "../../hstreamdb" }
1212

1313
log = "0.4.17"
14-
env_logger = "0.9.3"
14+
env_logger = "0.10.0"
1515

1616
once_cell = "1.17.0"
1717
rustler = "0.26.0"

0 commit comments

Comments
 (0)