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(file sink): Upgrade file sink for tokio-compat #1988

Merged
merged 30 commits into from
Mar 19, 2020
Merged

chore(file sink): Upgrade file sink for tokio-compat #1988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
0de147b
Revert "Disable file sink and files bench"
MOZGIII Mar 5, 2020
16260b2
Upgrade file sink for tokio 0.2
MOZGIII Mar 4, 2020
40cf84c
Further StreamingSink to refactoring
MOZGIII Mar 6, 2020
ee53620
Corrected tracing
MOZGIII Mar 6, 2020
e622ff1
Extracted event processing logic to a separate function
MOZGIII Mar 6, 2020
4d87cd5
Switch from futures::future::select to tokio02::select!
MOZGIII Mar 6, 2020
fa1d43d
Make ExpiringHashMap Unpin
MOZGIII Mar 9, 2020
f21e382
Move ?Sized to where clause
MOZGIII Mar 9, 2020
42e0563
Simplified the ExpiringHashMap API
MOZGIII Mar 9, 2020
0e9a3c7
Unify item kind at ExpiringHashMap::remove and ExpiringHashMap::poll_…
MOZGIII Mar 9, 2020
3aa371a
Move ExpiringHashMap to expiring_hash_map/mod.rs
MOZGIII Mar 9, 2020
2eb8419
Add some tests
MOZGIII Mar 9, 2020
65b95b9
Add insert_waker, make tests pass
MOZGIII Mar 9, 2020
565cb15
Add another test
MOZGIII Mar 9, 2020
e09e8ee
Improved value assertion test
MOZGIII Mar 9, 2020
6f335c5
Add wake count tests
MOZGIII Mar 9, 2020
a3fb117
Simplify compat, get rid of UnitTypeErrorSink01 in favor of sink_map_err
MOZGIII Mar 10, 2020
df961bc
Eliminate useless log message
MOZGIII Mar 10, 2020
c68bdbc
Switch FileSink to impl Future instead of Stream
MOZGIII Mar 10, 2020
0a15df1
Upgrade tokio for sync::Notify
MOZGIII Mar 10, 2020
a0048c2
Implemented an API that we settled on with Lucio
MOZGIII Mar 10, 2020
4f98750
Add docs
MOZGIII Mar 12, 2020
e6dcbe9
Better comment at the example
MOZGIII Mar 19, 2020
2ea84bc
Make StreamingSink::run's input 'static
MOZGIII Mar 19, 2020
3fecdd3
Remove .get_ref() from ?path
MOZGIII Mar 19, 2020
33ae750
Correct typos and grammar errors at the docs
MOZGIII Mar 19, 2020
448c2fe
Documented the unreachable! branch
MOZGIII Mar 19, 2020
f1f4258
Move expiring_hash_map tests mod into it's main file
MOZGIII Mar 19, 2020
9e4a0e4
Compacted nesting
MOZGIII Mar 19, 2020
d5b8f44
Fix the typos at the streaming sink compat docs
MOZGIII Mar 19, 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
45 changes: 41 additions & 4 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,13 @@ tracing-limit = { path = "lib/tracing-limit" }
futures01 = { package = "futures", version = "0.1.25" }
futures = { version = "0.3", default-features = false, features = ["compat"] }
tokio = { version = "0.1.22", features = ["io", "uds", "tcp", "rt-full", "experimental-tracing"], default-features = false }
tokio02 = { package = "tokio", version = "0.2", features = ["blocking"] }
tokio02 = { package = "tokio", version = "0.2.13", features = ["blocking", "fs", "sync", "macros", "test-util", "rt-core"] }
tokio-codec = "0.1.0"
tokio-openssl = "0.3.0"
tokio-retry = "0.2.0"
tokio-signal = "0.2.7"
tokio-compat = { version = "0.1", features = ["rt-full"] }
async-trait = "0.1"

# Tracing
tracing = "0.1.9"
Expand Down Expand Up @@ -178,6 +179,7 @@ trust-dns-server = "0.17.0"
trust-dns = "0.17.0"
trust-dns-proto = "0.8.0"
dirs = "2.0.2"
tokio-test = "0.2"

[features]
# Default features for *-unknown-linux-gnu and *-apple-darwin
Expand Down
2 changes: 1 addition & 1 deletion benches/bench.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ criterion_main!(
buffering::buffers,
http::http,
batch::batch,
/* files::files, */
files::files,
lua::lua,
event::event
);
Expand Down
2 changes: 0 additions & 2 deletions benches/files.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![cfg(feature = "disabled")]

use bytes::Bytes;
use criterion::{criterion_group, Benchmark, Criterion, Throughput};
use futures01::{sink::Sink, stream::Stream, Future};
Expand Down
Loading