Skip to content

Commit e85ee77

Browse files
authored
Merge branch 'main' into bitmap_instead_hll_smaller_int_types
2 parents 953a783 + eaf0a41 commit e85ee77

40 files changed

Lines changed: 3330 additions & 1622 deletions

File tree

datafusion/core/tests/memory_limit/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ async fn sort_merge_join_spill() {
213213
.with_config(config)
214214
.with_disk_manager_builder(DiskManagerBuilder::default())
215215
.with_scenario(Scenario::AccessLogStreaming)
216+
.with_expected_success()
216217
.run()
217218
.await
218219
}

0 commit comments

Comments
 (0)