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.

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

chore(deps): cargo upgrade parking_lot --all #470

Merged
merged 10 commits into from
Dec 13, 2020
Merged

chore(deps): cargo upgrade parking_lot --all #470

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
322e492
chore(deps): cargo upgrade parking_lot --all
niklasad1 Dec 7, 2020
9909c17
chore(deps): bump versions breaking change.
niklasad1 Dec 7, 2020
a2ac9be
chore: update changelog
niklasad1 Dec 7, 2020
eb8433a
fix nits
niklasad1 Dec 7, 2020
a433052
fix: kvdb-web add missing changelog entry
niklasad1 Dec 7, 2020
c97bc78
Merge remote-tracking branch 'origin/master' into na-bump-parking-lot…
niklasad1 Dec 7, 2020
cf0f1e1
fix: bad merge
niklasad1 Dec 7, 2020
fd5436a
fix more nits: use breaking label
niklasad1 Dec 7, 2020
b23a78a
[kvdb-memorydb]: add `wasm-bindgen` feature flag
niklasad1 Dec 11, 2020
3ea42ac
grumbles: remove `wasm-bindgen` feature flag
niklasad1 Dec 13, 2020
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
2 changes: 2 additions & 0 deletions kvdb-memorydb/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog].
[Keep a Changelog]: http://keepachangelog.com/en/1.0.0/

## [Unreleased]
### Breaking
- Updated dependencies. [#470](https://github.com/paritytech/parity-common/pull/470)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- Updated dependencies. [#470](https://github.com/paritytech/parity-common/pull/470)
- Updated dependencies, notably `parking_lot`. [#470](https://github.com/paritytech/parity-common/pull/470)

Maybe?


## [0.7.0] - 2020-06-24
- Updated `kvdb` to 0.7. [#402](https://github.com/paritytech/parity-common/pull/402)
Expand Down
14 changes: 9 additions & 5 deletions kvdb-memorydb/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
[package]
name = "kvdb-memorydb"
version = "0.7.0"
version = "0.8.0"
authors = ["Parity Technologies <admin@parity.io>"]
repository = "https://github.com/paritytech/parity-common"
description = "A key-value in-memory database that implements the `KeyValueDB` trait"
license = "MIT OR Apache-2.0"
edition = "2018"

[dependencies]
parity-util-mem = { path = "../parity-util-mem", version = "0.7", default-features = false, features = ["std"] }
parking_lot = "0.10.0"
kvdb = { version = "0.7", path = "../kvdb" }
parity-util-mem = { path = "../parity-util-mem", version = "0.8", default-features = false, features = ["std"] }
parking_lot = "0.11.1"
kvdb = { version = "0.8", path = "../kvdb" }

[dev-dependencies]
kvdb-shared-tests = { path = "../kvdb-shared-tests", version = "0.5" }
kvdb-shared-tests = { path = "../kvdb-shared-tests", version = "0.6" }

[features]
default = []
wasm-bindgen = ["parking_lot/wasm-bindgen"]
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is required because of https://github.com/Amanieu/parking_lot/blob/37ceeb36a1b0ef9cc0176ef0c9e35b8562002656/Cargo.toml#L31

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI, I didn't add this to:

  • parity-util-memory because it's an optional dependency
  • kvdb-rocksdb because it doesn't compile for WASM

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not ideal, because we'd want to eventually get rid of kvdb-memory from kvdb-web, but that would require making kvdb async.
What will likely happen is that kvdb-web will be deprecated (I think it's no longer used already?) in favor of what substrate-lite uses (based on localStorage?). And this feature of kvdb-memorydb will become useless.

However, I think kvdb-memorydb is mostly used for tests, so it's fine I guess ¯_(ツ)_/¯

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, we could do another super ugly hack, just to bring in parking_lot as a dependency in kvd-web with the wasm-bindgen feature then we don't have to have it in kvdb-memory because of how features work.

Copy link
Member

@ordian ordian Dec 11, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, that's what I did when I wrote

although in a hacky way

I think it's fine as is though. kvdb-memorydb could be in theory used in a wasm-bindgen environment

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just to bring in parking_lot as a dependency in kvd-web with the wasm-bindgen feature then we don't have to have it in kvdb-memory because of how features work.

This is terrible but let's do it anyway. We need a fat-ass comment in kvdb-web/Cargo.toml reminding us why it's here and to get rid of it as soon as possible.

6 changes: 4 additions & 2 deletions kvdb-rocksdb/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ The format is based on [Keep a Changelog].
[Keep a Changelog]: http://keepachangelog.com/en/1.0.0/

## [Unreleased]
### Breaking
- Updated dependencies. [#470](https://github.com/paritytech/parity-common/pull/470)

## [0.9.1] - 2020-08-26
- Updated rocksdb to 0.15. [#424](https://github.com/paritytech/parity-common/pull/424)
- Set `format_version` to 5. [#395](https://github.com/paritytech/parity-common/pull/395)
- Set `format_version` to 5. [#395](https://github.com/paritytech/parity-common/pull/395)

## [0.9.0] - 2020-06-24
- Updated `kvdb` to 0.7. [#402](https://github.com/paritytech/parity-common/pull/402)
Expand All @@ -18,7 +20,7 @@ The format is based on [Keep a Changelog].
### Breaking
- Updated to the new `kvdb` interface. [#313](https://github.com/paritytech/parity-common/pull/313)
- Rename and optimize prefix iteration. [#365](https://github.com/paritytech/parity-common/pull/365)
- Added Secondary Instance API. [#384](https://github.com/paritytech/parity-common/pull/384)
- Added Secondary Instance API. [#384](https://github.com/paritytech/parity-common/pull/384)

## [0.7.0] - 2020-03-16
- Updated dependencies. [#361](https://github.com/paritytech/parity-common/pull/361)
Expand Down
10 changes: 5 additions & 5 deletions kvdb-rocksdb/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "kvdb-rocksdb"
version = "0.9.1"
version = "0.10.0"
authors = ["Parity Technologies <admin@parity.io>"]
repository = "https://github.com/paritytech/parity-common"
description = "kvdb implementation backed by RocksDB"
Expand All @@ -14,20 +14,20 @@ harness = false
[dependencies]
smallvec = "1.0.0"
fs-swap = "0.2.4"
kvdb = { path = "../kvdb", version = "0.7" }
kvdb = { path = "../kvdb", version = "0.8" }
log = "0.4.8"
num_cpus = "1.10.1"
parking_lot = "0.10.0"
parking_lot = "0.11.1"
regex = "1.3.1"
rocksdb = { version = "0.15", features = ["snappy"], default-features = false }
owning_ref = "0.4.0"
parity-util-mem = { path = "../parity-util-mem", version = "0.7", default-features = false, features = ["std", "smallvec"] }
parity-util-mem = { path = "../parity-util-mem", version = "0.8", default-features = false, features = ["std", "smallvec"] }

[dev-dependencies]
alloc_counter = "0.0.4"
criterion = "0.3"
ethereum-types = { path = "../ethereum-types" }
kvdb-shared-tests = { path = "../kvdb-shared-tests", version = "0.5" }
kvdb-shared-tests = { path = "../kvdb-shared-tests", version = "0.6" }
rand = "0.7.2"
tempdir = "0.3.7"
keccak-hash = { path = "../keccak-hash" }
Expand Down
4 changes: 2 additions & 2 deletions kvdb-shared-tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[package]
name = "kvdb-shared-tests"
version = "0.5.0"
version = "0.6.0"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
description = "Shared tests for kvdb functionality, to be executed against actual implementations"
license = "MIT OR Apache-2.0"

[dependencies]
kvdb = { path = "../kvdb", version = "0.7" }
kvdb = { path = "../kvdb", version = "0.8" }
2 changes: 2 additions & 0 deletions kvdb-web/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog].
[Keep a Changelog]: http://keepachangelog.com/en/1.0.0/

## [Unreleased]
### Breaking
- Updated dependencies. [#470](https://github.com/paritytech/parity-common/pull/470)

## [0.7.0] - 2020-07-06
- Updated `kvdb` to 0.7.0 [#404](https://github.com/paritytech/parity-common/pull/404)
Expand Down
10 changes: 5 additions & 5 deletions kvdb-web/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "kvdb-web"
version = "0.7.0"
version = "0.8.0"
authors = ["Parity Technologies <admin@parity.io>"]
repository = "https://github.com/paritytech/parity-common"
description = "A key-value database for use in browsers"
Expand All @@ -11,12 +11,12 @@ edition = "2018"
[dependencies]
wasm-bindgen = "0.2.69"
js-sys = "0.3.46"
kvdb = { version = "0.7", path = "../kvdb" }
kvdb-memorydb = { version = "0.7", path = "../kvdb-memorydb" }
kvdb = { version = "0.8", path = "../kvdb" }
kvdb-memorydb = { version = "0.8", path = "../kvdb-memorydb", features = ["wasm-bindgen"] }
futures = "0.3.8"
log = "0.4.11"
send_wrapper = "0.5.0"
parity-util-mem = { path = "../parity-util-mem", version = "0.7", default-features = false }
parity-util-mem = { path = "../parity-util-mem", version = "0.8", default-features = false }

[dependencies.web-sys]
version = "0.3.46"
Expand All @@ -40,6 +40,6 @@ features = [

[dev-dependencies]
console_log = "0.2.0"
kvdb-shared-tests = { path = "../kvdb-shared-tests", version = "0.5" }
kvdb-shared-tests = { path = "../kvdb-shared-tests", version = "0.6" }
wasm-bindgen-test = "0.3.19"
wasm-bindgen-futures = "0.4.19"
2 changes: 2 additions & 0 deletions kvdb/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog].
[Keep a Changelog]: http://keepachangelog.com/en/1.0.0/

## [Unreleased]
### Breaking
- Updated `parity-util-mem` to 0.8. [#470](https://github.com/paritytech/parity-common/pull/470)

## [0.7.0] - 2020-06-24
- Updated `parity-util-mem` to 0.7. [#402](https://github.com/paritytech/parity-common/pull/402)
Expand Down
4 changes: 2 additions & 2 deletions kvdb/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "kvdb"
version = "0.7.0"
version = "0.8.0"
authors = ["Parity Technologies <admin@parity.io>"]
repository = "https://github.com/paritytech/parity-common"
description = "Generic key-value trait"
Expand All @@ -9,4 +9,4 @@ edition = "2018"

[dependencies]
smallvec = "1.0.0"
parity-util-mem = { path = "../parity-util-mem", version = "0.7", default-features = false }
parity-util-mem = { path = "../parity-util-mem", version = "0.8", default-features = false }
2 changes: 2 additions & 0 deletions parity-util-mem/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ The format is based on [Keep a Changelog].

## [Unreleased]
- Updated dlmalloc to 0.2.1. [#452](https://github.com/paritytech/parity-common/pull/452)

### Breaking
- Updated `ethereum-types` to 0.10. [#463](https://github.com/paritytech/parity-common/pull/463)
- Updated `parking_lot` to 0.11.1. [#470](https://github.com/paritytech/parity-common/pull/470)

## [0.7.0] - 2020-06-24
- Added `const_size` to `MallocSizeOf` to optimize it for flat collections. [#398](https://github.com/paritytech/parity-common/pull/398)
Expand Down
4 changes: 2 additions & 2 deletions parity-util-mem/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "parity-util-mem"
version = "0.7.0"
version = "0.8.0"
authors = ["Parity Technologies <admin@parity.io>"]
repository = "https://github.com/paritytech/parity-common"
description = "Collection of memory related utilities"
Expand All @@ -27,7 +27,7 @@ impl-trait-for-tuples = "0.1.3"

smallvec = { version = "1.0.0", optional = true }
ethereum-types = { version = "0.10.0", optional = true, path = "../ethereum-types" }
parking_lot = { version = "0.10.0", optional = true }
parking_lot = { version = "0.11.1", optional = true }
primitive-types = { version = "0.8", path = "../primitive-types", default-features = false, optional = true }

[target.'cfg(target_os = "windows")'.dependencies]
Expand Down