Skip to content

Commit cb41d2b

Browse files
authored
Merge branch 'main' into matthew.kim/parquet-engine-upstream
2 parents 437655e + 9415998 commit cb41d2b

6 files changed

Lines changed: 274 additions & 90 deletions

File tree

LICENSE-3rdparty.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ darling_macro,https://github.com/TedDriggs/darling,MIT,Ted Driggs <ted.driggs@ou
188188
dashmap,https://github.com/xacrimon/dashmap,MIT,Acrimon <joel.wejdenstal@gmail.com>
189189
data-encoding,https://github.com/ia0/data-encoding,MIT,Julien Cretin <git@ia0.eu>
190190
data-url,https://github.com/servo/rust-url,MIT OR Apache-2.0,Simon Sapin <simon.sapin@exyr.org>
191+
datasketches,https://github.com/apache/datasketches-rust,Apache-2.0,The datasketches Authors
191192
dbl,https://github.com/RustCrypto/utils,MIT OR Apache-2.0,RustCrypto Developers
192193
deadpool,https://github.com/bikeshedder/deadpool,MIT OR Apache-2.0,Michael P. Jung <michael.jung@terreon.de>
193194
deadpool-runtime,https://github.com/bikeshedder/deadpool,MIT OR Apache-2.0,Michael P. Jung <michael.jung@terreon.de>
@@ -314,7 +315,6 @@ hyper-rustls,https://github.com/rustls/hyper-rustls,Apache-2.0 OR ISC OR MIT,The
314315
hyper-timeout,https://github.com/hjr3/hyper-timeout,MIT OR Apache-2.0,Herman J. Radtke III <herman@hermanradtke.com>
315316
hyper-tls,https://github.com/hyperium/hyper-tls,MIT OR Apache-2.0,Sean McArthur <sean@seanmonstar.com>
316317
hyper-util,https://github.com/hyperium/hyper-util,MIT,Sean McArthur <sean@seanmonstar.com>
317-
hyperloglogplus,https://github.com/tabac/hyperloglog.rs,MIT,Tasos Bakogiannis <t.bakogiannis@gmail.com>
318318
iana-time-zone,https://github.com/strawlab/iana-time-zone,MIT OR Apache-2.0,"Andrew Straw <strawman@astraw.com>, René Kijewski <rene.kijewski@fu-berlin.de>, Ryan Lopopolo <rjl@hyperbo.la>"
319319
iana-time-zone-haiku,https://github.com/strawlab/iana-time-zone,MIT OR Apache-2.0,René Kijewski <crates.io@k6i.de>
320320
icu_collections,https://github.com/unicode-org/icu4x,Unicode-3.0,The ICU4X Project Developers

quickwit/Cargo.lock

Lines changed: 39 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

quickwit/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ quickwit-serve = { path = "quickwit-serve" }
372372
quickwit-storage = { path = "quickwit-storage" }
373373
quickwit-telemetry = { path = "quickwit-telemetry" }
374374

375-
tantivy = { git = "https://github.com/quickwit-oss/tantivy/", rev = "98ebbf9", default-features = false, features = [
375+
tantivy = { git = "https://github.com/quickwit-oss/tantivy/", rev = "545169c0d8", default-features = false, features = [
376376
"lz4-compression",
377377
"mmap",
378378
"quickwit",

quickwit/quickwit-indexing/src/controlled_directory.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ impl Directory for ControlledDirectory {
9393
self.check_if_alive()
9494
.map_err(|io_err| OpenWriteError::wrap_io_error(io_err, path.to_path_buf()))?;
9595

96-
let underlying_wrt: Box<dyn TerminatingWrite> = self
96+
let underlying_wrt: Box<dyn TerminatingWrite + Send + Sync> = self
9797
.underlying
9898
.open_write(path)?
9999
.into_inner()
@@ -154,7 +154,9 @@ impl IoControlsAccess for HotswappableIoControls {
154154
}
155155

156156
// Wrapper to work around the orphan rule. (hence the word "Adopted").
157-
struct AdoptedControlledWrite(ControlledWrite<HotswappableIoControls, Box<dyn TerminatingWrite>>);
157+
struct AdoptedControlledWrite(
158+
ControlledWrite<HotswappableIoControls, Box<dyn TerminatingWrite + Send + Sync>>,
159+
);
158160

159161
impl io::Write for AdoptedControlledWrite {
160162
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {

0 commit comments

Comments
 (0)