chore: upgrade rust toolchain to latest nightly (#2049)

* chore: upgrade rust toolchain to latest nightly

* rebase develop

* update rust toolchain in ci
This commit is contained in:
LFC
2023-08-08 15:17:51 +08:00
committed by GitHub
parent 7d0d8dc6e3
commit 46fa3eb629
127 changed files with 551 additions and 339 deletions

View File

@@ -422,9 +422,13 @@ impl<S: StorageEngine> MitoEngineInner<S> {
let table_dir = table_dir(catalog_name, schema_name, table_id);
let Some((manifest, table_info)) = self
.recover_table_manifest_and_info(table_name, &table_dir)
.await.map_err(BoxedError::new)
.context(table_error::TableOperationSnafu)? else { return Ok(None) };
.recover_table_manifest_and_info(table_name, &table_dir)
.await
.map_err(BoxedError::new)
.context(table_error::TableOperationSnafu)?
else {
return Ok(None);
};
let compaction_strategy = CompactionStrategy::from(&table_info.meta.options.extra_options);
let opts = OpenOptions {
@@ -628,9 +632,12 @@ impl<S: StorageEngine> MitoEngineInner<S> {
self.object_store.clone(),
self.compress_type,
);
let Some(table_info) =
let Some(table_info) =
MitoTable::<<S as StorageEngine>::Region>::recover_table_info(table_name, &manifest)
.await? else { return Ok(None) };
.await?
else {
return Ok(None);
};
Ok(Some((manifest, table_info)))
}

View File

@@ -63,7 +63,7 @@ mod procedure_test_util {
let compaction_scheduler = Arc::new(NoopCompactionScheduler::default());
let storage_engine = EngineImpl::new(
StorageEngineConfig::default(),
Arc::new(NoopLogStore::default()),
Arc::new(NoopLogStore),
object_store.clone(),
compaction_scheduler,
)

View File

@@ -202,9 +202,8 @@ impl<S: StorageEngine> AlterMitoTable<S> {
/// Alter regions.
async fn alter_regions(&mut self) -> Result<()> {
let Some(alter_op) = &self.alter_op else {
// Don't need to alter the region.
return Ok(());
};
return Ok(());
};
let table_name = &self.data.request.table_name;
let table_version = self.data.table_version;

View File

@@ -62,7 +62,9 @@ impl<S: StorageEngine> Procedure for DropMitoTable<S> {
fn lock_key(&self) -> LockKey {
let table_ref = self.data.table_ref();
let Some(table) = &self.table else { return LockKey::default() };
let Some(table) = &self.table else {
return LockKey::default();
};
let info = table.table_info();
let keys = info
.meta

View File

@@ -78,7 +78,7 @@ async fn setup_table_with_column_default_constraint() -> (TempDir, String, Table
EngineConfig::default(),
EngineImpl::new(
StorageEngineConfig::default(),
Arc::new(NoopLogStore::default()),
Arc::new(NoopLogStore),
object_store.clone(),
compaction_scheduler,
)

View File

@@ -166,7 +166,7 @@ pub async fn setup_test_engine_and_table() -> TestEngineComponents {
let compaction_scheduler = Arc::new(NoopCompactionScheduler::default());
let storage_engine = EngineImpl::new(
StorageEngineConfig::default(),
Arc::new(NoopLogStore::default()),
Arc::new(NoopLogStore),
object_store.clone(),
compaction_scheduler,
)