Skip to content
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.

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

Jump to bottom

*/Cargo.toml: Quaratine jemalloc with features #5299

Merged
merged 15 commits into from Sep 5, 2019
Merged

*/Cargo.toml: Quaratine jemalloc with features #5299

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2ae2b84
*/Cargo.toml: Quaratine jemalloc with features
Hoverbear Aug 18, 2019
1977309
Merge branch 'master' into jemalloc-quarantine
Hoverbear Aug 19, 2019
a8bfb06
Merge branch 'master' into jemalloc-quarantine
Hoverbear Aug 21, 2019
857203a
Trim mistaken inclusion
Hoverbear Aug 21, 2019
2809dcb
Clean default features
Hoverbear Aug 21, 2019
0e04f7e
Remove unnecessary no-default-features
Hoverbear Aug 22, 2019
ae03fb2
Merge branch 'master' into jemalloc-quarantine
Hoverbear Aug 22, 2019
09dbf80
Clean unnecessary engine feature
Hoverbear Aug 26, 2019
0f5a2c0
Merge branch 'jemalloc-quarantine' of github.com:Hoverbear/tikv into …
Hoverbear Aug 26, 2019
2c4fa89
Merge branch 'master' into jemalloc-quarantine
Hoverbear Aug 26, 2019
d4c1123
Merge branch 'master' into jemalloc-quarantine
Hoverbear Aug 27, 2019
399307f
Actually remove engine default feature.
Hoverbear Sep 4, 2019
7995fbc
Merge branch 'jemalloc-quarantine' of github.com:Hoverbear/tikv into …
Hoverbear Sep 4, 2019
4f0bba6
Merge branch 'master' into jemalloc-quarantine
Hoverbear Sep 4, 2019
8d44e8f
Merge branch 'master' into jemalloc-quarantine
Hoverbear Sep 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@ edition = "2018"
publish = false

[features]
default = ["tikv_alloc/default"]
default = ["jemalloc"]
tcmalloc = ["tikv_alloc/tcmalloc"]
jemalloc = ["tikv_alloc/jemalloc", "engine/jemalloc"]
mimalloc = ["tikv_alloc/mimalloc"]
Expand Down Expand Up @@ -116,7 +116,7 @@ kvproto = { git = "https://github.com/pingcap/kvproto.git" }
tikv_alloc = { path = "components/tikv_alloc", default-features = false }
tikv_util = { path = "components/tikv_util" }
log_wrappers = { path = "components/log_wrappers" }
engine = { path = "components/engine" }
engine = { path = "components/engine", default-features = false }
Hoverbear marked this conversation as resolved.
Show resolved Hide resolved
Hoverbear marked this conversation as resolved.
Show resolved Hide resolved
tidb_query = { path = "components/tidb_query" }
pd_client = { path = "components/pd_client" }

Expand Down
2 changes: 1 addition & 1 deletion components/engine/Cargo.toml
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@ slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debu
slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global.git", rev = "91904ade" }
time = "0.1"
sys-info = "0.5.7"
tikv_alloc = { path = "../tikv_alloc", default-features = false }
tikv_alloc = { path = "../tikv_alloc" }
serde = "1.0"
serde_derive = "1.0"
toml = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion components/test_util/Cargo.toml
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@ publish = false

[dependencies]
tikv_util = { path = "../tikv_util" }
tikv_alloc = { path = "../tikv_alloc", default-features = false }
tikv_alloc = { path = "../tikv_alloc" }
time = "0.1"
rand = "0.6.5"
rand_isaac = "0.1.1"
Expand Down
3 changes: 1 addition & 2 deletions components/tidb_query_datatype/Cargo.toml
View file
Open in desktop
Expand Up @@ -11,5 +11,4 @@ bitflags = "1.0"
enum-primitive-derive = "0.1"
num-traits = "0.2"
failure = "0.1"

tikv_alloc = { path = "../tikv_alloc", default-features = false }
tikv_alloc = { path = "../tikv_alloc" }
1 change: 0 additions & 1 deletion components/tikv_alloc/Cargo.toml
View file
Open in desktop
Expand Up @@ -6,7 +6,6 @@ authors = ["Brian Anderson <andersrb@gmail.com>"]
publish = false

[features]
default = ["jemalloc"]
jemalloc = ["jemallocator", "jemalloc-sys", "jemalloc-ctl"]

# Build jemalloc's profiling features. Without this
Expand Down