Skip to content

Commit 00685df

Browse files
committed
fix: workaround to fix future is not Sync
1 parent fd07431 commit 00685df

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/script/src/python/builtins.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,7 @@ pub(crate) mod greptime_builtin {
962962
Ok(obj) => match py_vec_obj_to_array(&obj, vm, 1){
963963
Ok(v) => if v.len()==1{
964964
Ok(v)
965-
}else{
965+
} else {
966966
Err(vm.new_runtime_error(format!("Expect return's length to be at most one, found to be length of {}.", v.len())))
967967
},
968968
Err(err) => Err(vm

src/storage/src/compaction/scheduler.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ impl<R: CompactionRequest, T: CompactionTask, P: Picker<R, T>> CompactionHandler
207207
debug!("Executing compaction request: {}", region_id);
208208
if let Err(e) = self.handle_compaction_request(req, token).await {
209209
error!(e; "Failed to submit compaction task for region: {}", region_id);
210-
}else{
210+
} else {
211211
info!("Submitted region compaction task: {}", region_id);
212212
}
213213
} else {

src/storage/src/flush.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ impl<S: LogStore> FlushJob<S> {
215215
Ok(metas)
216216
}
217217

218-
async fn write_manifest_and_apply(&self, file_metas: &[FileMeta]) -> Result<()> {
218+
async fn write_manifest_and_apply(&mut self, file_metas: &[FileMeta]) -> Result<()> {
219219
let edit = RegionEdit {
220220
region_version: self.shared.version_control.metadata().version(),
221221
flushed_sequence: Some(self.flush_sequence),
@@ -246,7 +246,7 @@ impl<S: LogStore> Job for FlushJob<S> {
246246
// TODO(yingwen): [flush] Support in-job parallelism (Flush memtables concurrently)
247247
async fn run(&mut self, ctx: &Context) -> Result<()> {
248248
let file_metas = self.write_memtables_to_layer(ctx).await?;
249-
Self::write_manifest_and_apply(self, &file_metas).await?;
249+
self.write_manifest_and_apply(&file_metas).await?;
250250

251251
if let Some(cb) = self.on_success.lock().await.take() {
252252
cb.await;

0 commit comments

Comments
 (0)