-
Notifications
You must be signed in to change notification settings - Fork 87
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into async_insert
- Loading branch information
Showing
28 changed files
with
694 additions
and
501 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
[package] | ||
name = "clickhouse" | ||
version = "0.11.4" | ||
version = "0.11.6" | ||
description = "A typed client for ClickHouse with killer features" | ||
keywords = ["clickhouse", "database", "driver", "tokio", "hyper"] | ||
authors = ["Paul Loyd <[email protected]>"] | ||
repository = "https://github.com/loyd/clickhouse.rs" | ||
license = "MIT OR Apache-2.0" | ||
readme = "README.md" | ||
edition = "2018" | ||
edition = "2021" | ||
rust-version = "1.60" | ||
|
||
[package.metadata.docs.rs] | ||
|
@@ -34,17 +34,15 @@ required-features = ["test-util"] | |
debug = true | ||
|
||
[features] | ||
default = ["lz4", "tls"] | ||
default = ["lz4", "tls", "quanta"] | ||
|
||
test-util = ["hyper/server"] | ||
watch = ["dep:sha-1", "dep:serde_json"] | ||
lz4 = ["dep:lz4", "dep:clickhouse-rs-cityhash-sys"] | ||
uuid = ["dep:uuid"] | ||
time = ["dep:time"] | ||
tls = ["dep:hyper-tls"] | ||
|
||
# Temporary workaround for https://github.com/ClickHouse/ClickHouse/issues/37420 | ||
wa-37420 = [] | ||
quanta = ["dep:quanta"] | ||
|
||
[dependencies] | ||
clickhouse-derive = { version = "0.1.1", path = "derive" } | ||
|
@@ -58,23 +56,23 @@ hyper-tls = { version = "0.5.0", optional = true } | |
url = "2.1.1" | ||
futures = "0.3.5" | ||
static_assertions = "1.1" | ||
sealed = "0.4" | ||
sealed = "0.5" | ||
sha-1 = { version = "0.10", optional = true } | ||
serde_json = { version = "1.0.68", optional = true } | ||
lz4 = { version = "1.23.3", optional = true } | ||
clickhouse-rs-cityhash-sys = { version = "0.1.2", optional = true } | ||
uuid = { version = "1", optional = true } | ||
time = { version = "0.3", optional = true } | ||
bstr = { version = "1.2", default-features = false } | ||
quanta = { version = "0.12", optional = true } | ||
|
||
[dev-dependencies] | ||
criterion = "0.4.0" | ||
criterion = "0.5.0" | ||
serde = { version = "1.0.106", features = ["derive"] } | ||
tokio = { version = "1.0.1", features = ["full", "test-util"] } | ||
hyper = { version = "0.14", features = ["client", "tcp", "http1", "stream", "server"] } | ||
serde_bytes = "0.11.4" | ||
serde_repr = "0.1.7" | ||
uuid = { version = "1", features = ["v4"] } | ||
function_name = "0.3" | ||
time = { version = "0.3.17", features = ["macros", "rand"] } | ||
rand = "0.8.5" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.