This is an automated email from the ASF dual-hosted git repository.
xuanwo pushed a commit to branch add-pg-support
in repository https://gitbox.apache.org/repos/asf/incubator-opendal.git
The following commit(s) were added to refs/heads/add-pg-support by this push:
new 1e11ab22f Format toml
1e11ab22f is described below
commit 1e11ab22f70dc2570ca32485d8ada7fff1e50768
Author: Xuanwo <[email protected]>
AuthorDate: Wed Aug 9 17:19:46 2023 +0800
Format toml
Signed-off-by: Xuanwo <[email protected]>
---
bin/oay/Cargo.toml | 17 ++-----
bin/oli/Cargo.toml | 2 +-
bindings/lua/Cargo.toml | 6 +--
bindings/ocaml/Cargo.toml | 5 +-
core/Cargo.toml | 85 ++++++++++++++++++++++++++-----
core/src/services/tikv/fixtures/pd.toml | 2 +-
core/src/services/tikv/fixtures/tikv.toml | 8 +--
7 files changed, 89 insertions(+), 36 deletions(-)
diff --git a/bin/oay/Cargo.toml b/bin/oay/Cargo.toml
index 8556a0418..9bdf490a6 100644
--- a/bin/oay/Cargo.toml
+++ b/bin/oay/Cargo.toml
@@ -30,25 +30,21 @@ rust-version.workspace = true
version.workspace = true
[features]
-default = [
- "frontends-webdav",
- "frontends-s3"
-]
+default = ["frontends-webdav", "frontends-s3"]
-frontends-webdav = [
- "dep:dav-server",
- "dep:bytes",
- "dep:futures-util"
-]
frontends-s3 = []
+frontends-webdav = ["dep:dav-server", "dep:bytes", "dep:futures-util"]
[dependencies]
anyhow = "1"
axum = "0.6"
+bytes = { version = "1.4.0", optional = true }
chrono = "0.4.26"
clap = { version = "4", features = ["cargo", "string"] }
+dav-server = { version = "0.5.5", optional = true }
dirs = "5.0.0"
futures = "0.3"
+futures-util = { version = "0.3.16", optional = true }
opendal.workspace = true
quick-xml = { version = "0.29", features = ["serialize", "overlapped-lists"] }
serde = { version = "1", features = ["derive"] }
@@ -65,6 +61,3 @@ tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
url = "2.3.1"
uuid = { version = "1", features = ["v4", "fast-rng"] }
-dav-server = { version = "0.5.5", optional = true }
-bytes = { version = "1.4.0", optional = true }
-futures-util = { version = "0.3.16", optional = true }
diff --git a/bin/oli/Cargo.toml b/bin/oli/Cargo.toml
index 42b5ed69c..3402aaa59 100644
--- a/bin/oli/Cargo.toml
+++ b/bin/oli/Cargo.toml
@@ -74,4 +74,4 @@ url = "2.3.1"
[dev-dependencies]
assert_cmd = "2"
predicates = "3"
-tempfile = "3.7.1"
\ No newline at end of file
+tempfile = "3.7.1"
diff --git a/bindings/lua/Cargo.toml b/bindings/lua/Cargo.toml
index fed7aa5d3..4661d4f7d 100644
--- a/bindings/lua/Cargo.toml
+++ b/bindings/lua/Cargo.toml
@@ -29,7 +29,6 @@ rust-version.workspace = true
# See more keys and their definitions at
https://doc.rust-lang.org/cargo/reference/manifest.html
-
[features]
default = ["mlua/lua52"]
lua52 = ["mlua", "mlua/lua52"]
@@ -38,6 +37,7 @@ lua52 = ["mlua", "mlua/lua52"]
crate-type = ["cdylib"]
[dependencies]
-mlua = { version = "0.8", features = ["module"], default-features = false,
optional = true }
+mlua = { version = "0.8", features = [
+ "module",
+], default-features = false, optional = true }
opendal.workspace = true
-
diff --git a/bindings/ocaml/Cargo.toml b/bindings/ocaml/Cargo.toml
index a0dbd4b17..3dffc0471 100644
--- a/bindings/ocaml/Cargo.toml
+++ b/bindings/ocaml/Cargo.toml
@@ -32,9 +32,8 @@ crate-type = ["staticlib", "cdylib"]
doc = false
[dependencies]
+ocaml = { version = "^1.0.0-beta" }
opendal.workspace = true
-ocaml = {version = "^1.0.0-beta"}
[build-dependencies]
-ocaml-build = {version = "^1.0.0-beta"}
-
+ocaml-build = { version = "^1.0.0-beta" }
diff --git a/core/Cargo.toml b/core/Cargo.toml
index f177bbbc5..09087772d 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -34,7 +34,23 @@ version.workspace = true
all-features = true
[features]
-default = ["rustls", "services-azblob", "services-azdfs", "services-cos",
"services-fs", "services-gcs", "services-ghac", "services-http",
"services-ipmfs", "services-memory", "services-obs", "services-oss",
"services-s3", "services-webdav", "services-webhdfs"]
+default = [
+ "rustls",
+ "services-azblob",
+ "services-azdfs",
+ "services-cos",
+ "services-fs",
+ "services-gcs",
+ "services-ghac",
+ "services-http",
+ "services-ipmfs",
+ "services-memory",
+ "services-obs",
+ "services-oss",
+ "services-s3",
+ "services-webdav",
+ "services-webhdfs",
+]
# Build docs or not.
#
@@ -53,7 +69,16 @@ native-tls = ["reqwest/native-tls"]
native-tls-vendored = ["reqwest/native-tls-vendored"]
# Enable all layers.
-layers-all = ["layers-chaos", "layers-metrics", "layers-prometheus",
"layers-tracing", "layers-minitrace", "layers-throttle", "layers-await-tree",
"layers-async-backtrace"]
+layers-all = [
+ "layers-chaos",
+ "layers-metrics",
+ "layers-prometheus",
+ "layers-tracing",
+ "layers-minitrace",
+ "layers-throttle",
+ "layers-await-tree",
+ "layers-async-backtrace",
+]
# Enable layers chaos support
layers-chaos = ["dep:rand"]
# Enable layers metrics support
@@ -75,17 +100,34 @@ layers-await-tree = ["dep:await-tree"]
# Enable layers async-backtrace support.
layers-async-backtrace = ["dep:async-backtrace"]
-services-azblob = ["dep:sha2", "dep:reqsign", "reqsign?/services-azblob",
"reqsign?/reqwest_request"]
-services-azdfs = ["dep:reqsign", "reqsign?/services-azblob",
"reqsign?/reqwest_request"]
+services-azblob = [
+ "dep:sha2",
+ "dep:reqsign",
+ "reqsign?/services-azblob",
+ "reqsign?/reqwest_request",
+]
+services-azdfs = [
+ "dep:reqsign",
+ "reqsign?/services-azblob",
+ "reqsign?/reqwest_request",
+]
services-cacache = ["dep:cacache"]
-services-cos = ["dep:reqsign", "reqsign?/services-tencent",
"reqsign?/reqwest_request"]
+services-cos = [
+ "dep:reqsign",
+ "reqsign?/services-tencent",
+ "reqsign?/reqwest_request",
+]
services-dashmap = ["dep:dashmap"]
services-dropbox = []
services-etcd = ["dep:etcd-client"]
services-foundationdb = ["dep:foundationdb"]
services-fs = ["tokio/fs"]
services-ftp = ["dep:suppaftp", "dep:lazy-regex", "dep:bb8", "dep:async-tls"]
-services-gcs = ["dep:reqsign", "reqsign?/services-google",
"reqsign?/reqwest_request"]
+services-gcs = [
+ "dep:reqsign",
+ "reqsign?/services-google",
+ "reqsign?/reqwest_request",
+]
services-gdrive = []
services-ghac = []
services-hdfs = ["dep:hdrs"]
@@ -96,23 +138,39 @@ services-memcached = ["dep:bb8"]
services-memory = []
services-mini-moka = ["dep:mini-moka"]
services-moka = ["dep:moka"]
-services-obs = ["dep:reqsign", "reqsign?/services-huaweicloud",
"reqsign?/reqwest_request"]
+services-obs = [
+ "dep:reqsign",
+ "reqsign?/services-huaweicloud",
+ "reqsign?/reqwest_request",
+]
services-onedrive = []
-services-postgresql = ["dep:tokio-postgres"]
-services-oss = ["dep:reqsign", "reqsign?/services-aliyun",
"reqsign?/reqwest_request"]
+services-oss = [
+ "dep:reqsign",
+ "reqsign?/services-aliyun",
+ "reqsign?/reqwest_request",
+]
services-persy = ["dep:persy"]
+services-postgresql = ["dep:tokio-postgres"]
services-redb = ["dep:redb"]
services-redis = ["dep:redis"]
services-redis-native-tls = ["services-redis", "redis?/tokio-native-tls-comp"]
services-redis-rustls = ["services-redis", "redis?/tokio-rustls-comp"]
services-rocksdb = ["dep:rocksdb"]
-services-s3 = ["dep:reqsign", "reqsign?/services-aws",
"reqsign?/reqwest_request"]
+services-s3 = [
+ "dep:reqsign",
+ "reqsign?/services-aws",
+ "reqsign?/reqwest_request",
+]
services-sftp = ["dep:openssh", "dep:openssh-sftp-client", "dep:dirs"]
services-sled = ["dep:sled"]
services-supabase = []
services-tikv = ["tikv-client"]
services-vercel-artifacts = []
-services-wasabi = ["dep:reqsign", "reqsign?/services-aws",
"reqsign?/reqwest_request"]
+services-wasabi = [
+ "dep:reqsign",
+ "reqsign?/services-aws",
+ "reqsign?/reqwest_request",
+]
services-webdav = []
services-webhdfs = []
@@ -143,7 +201,10 @@ cacache = { version = "11.6", default-features = false,
features = [
"tokio-runtime",
"mmap",
], optional = true }
-chrono = { version = "0.4.26", default-features = false, features = ["clock",
"std"] }
+chrono = { version = "0.4.26", default-features = false, features = [
+ "clock",
+ "std",
+] }
dashmap = { version = "5.4", optional = true }
dirs = { version = "5.0.1", optional = true }
etcd-client = { version = "0.11", optional = true, features = ["tls"] }
diff --git a/core/src/services/tikv/fixtures/pd.toml
b/core/src/services/tikv/fixtures/pd.toml
index 39393f698..613d1bf8e 100644
--- a/core/src/services/tikv/fixtures/pd.toml
+++ b/core/src/services/tikv/fixtures/pd.toml
@@ -16,5 +16,5 @@
# under the License.
[schedule]
+max-merge-region-keys = 3
max-merge-region-size = 1
-max-merge-region-keys = 3
\ No newline at end of file
diff --git a/core/src/services/tikv/fixtures/tikv.toml
b/core/src/services/tikv/fixtures/tikv.toml
index 2fc4204a5..62e194bf4 100644
--- a/core/src/services/tikv/fixtures/tikv.toml
+++ b/core/src/services/tikv/fixtures/tikv.toml
@@ -16,19 +16,19 @@
# under the License.
[coprocessor]
+batch-split-limit = 100
region-max-keys = 10
region-split-keys = 7
-batch-split-limit = 100
[raftstore]
-region-split-check-diff = "1B"
pd-heartbeat-tick-interval = "2s"
pd-store-heartbeat-tick-interval = "5s"
-split-region-check-tick-interval = "1s"
raft-entry-max-size = "10MB"
+region-split-check-diff = "1B"
+split-region-check-tick-interval = "1s"
[rocksdb]
max-open-files = 10000
[raftdb]
-max-open-files = 10000
\ No newline at end of file
+max-open-files = 10000
