Skip to content

Commit

Permalink
chore: deny unused results
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelScofield committed Jun 25, 2023
1 parent fd412b7 commit e2fb357
Show file tree
Hide file tree
Showing 248 changed files with 1,265 additions and 1,223 deletions.
1 change: 1 addition & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ rustflags = [
"-Wclippy::print_stderr",
"-Wclippy::implicit_clone",
"-Aclippy::items_after_test_module",
"-Wunused_results",
]
31 changes: 15 additions & 16 deletions benchmarks/src/bin/nyc-taxi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ async fn write_data(
};

let now = Instant::now();
db.insert(requests).await.unwrap();
let _ = db.insert(requests).await.unwrap();
let elapsed = now.elapsed();
total_rpc_elapsed_ms += elapsed.as_millis();
progress_bar.inc(row_count as _);
Expand Down Expand Up @@ -377,19 +377,16 @@ fn create_table_expr() -> CreateTableExpr {
}

fn query_set() -> HashMap<String, String> {
let mut ret = HashMap::new();

ret.insert(
"count_all".to_string(),
format!("SELECT COUNT(*) FROM {TABLE_NAME};"),
);

ret.insert(
"fare_amt_by_passenger".to_string(),
format!("SELECT passenger_count, MIN(fare_amount), MAX(fare_amount), SUM(fare_amount) FROM {TABLE_NAME} GROUP BY passenger_count")
);

ret
HashMap::from([
(
"count_all".to_string(),
format!("SELECT COUNT(*) FROM {TABLE_NAME};"),
),
(
"fare_amt_by_passenger".to_string(),
format!("SELECT passenger_count, MIN(fare_amount), MAX(fare_amount), SUM(fare_amount) FROM {TABLE_NAME} GROUP BY passenger_count"),
)
])
}

async fn do_write(args: &Args, db: &Database) {
Expand All @@ -414,7 +411,8 @@ async fn do_write(args: &Args, db: &Database) {
let db = db.clone();
let mpb = multi_progress_bar.clone();
let pb_style = progress_bar_style.clone();
write_jobs.spawn(async move { write_data(batch_size, &db, path, mpb, pb_style).await });
let _ = write_jobs
.spawn(async move { write_data(batch_size, &db, path, mpb, pb_style).await });
}
}
while write_jobs.join_next().await.is_some() {
Expand All @@ -423,7 +421,8 @@ async fn do_write(args: &Args, db: &Database) {
let db = db.clone();
let mpb = multi_progress_bar.clone();
let pb_style = progress_bar_style.clone();
write_jobs.spawn(async move { write_data(batch_size, &db, path, mpb, pb_style).await });
let _ = write_jobs
.spawn(async move { write_data(batch_size, &db, path, mpb, pb_style).await });
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/catalog/src/helper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,6 @@ mod tests {
#[test]
fn test_table_global_value_compatibility() {
let s = r#"{"node_id":1,"regions_id_map":{"1":[0]},"table_info":{"ident":{"table_id":1098,"version":1},"name":"container_cpu_limit","desc":"Created on insertion","catalog_name":"greptime","schema_name":"dd","meta":{"schema":{"column_schemas":[{"name":"container_id","data_type":{"String":null},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}},{"name":"container_name","data_type":{"String":null},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}},{"name":"docker_image","data_type":{"String":null},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}},{"name":"host","data_type":{"String":null},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}},{"name":"image_name","data_type":{"String":null},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}},{"name":"image_tag","data_type":{"String":null},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}},{"name":"interval","data_type":{"String":null},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}},{"name":"runtime","data_type":{"String":null},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}},{"name":"short_image","data_type":{"String":null},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}},{"name":"type","data_type":{"String":null},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}},{"name":"dd_value","data_type":{"Float64":{}},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}},{"name":"ts","data_type":{"Timestamp":{"Millisecond":null}},"is_nullable":false,"is_time_index":true,"default_constraint":null,"metadata":{"greptime:time_index":"true"}},{"name":"git.repository_url","data_type":{"String":null},"is_nullable":true,"is_time_index":false,"default_constraint":null,"metadata":{}}],"timestamp_index":11,"version":1},"primary_key_indices":[0,1,2,3,4,5,6,7,8,9,12],"value_indices":[10,11],"engine":"mito","next_column_id":12,"region_numbers":[],"engine_options":{},"options":{},"created_on":"1970-01-01T00:00:00Z"},"table_type":"Base"}}"#;
TableGlobalValue::parse(s).unwrap();
assert!(TableGlobalValue::parse(s).is_ok());
}
}
2 changes: 1 addition & 1 deletion src/catalog/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ pub(crate) async fn handle_system_table_request<'a, M: CatalogManager>(
table_name,
),
})?;
manager
let _ = manager
.register_table(RegisterTableRequest {
catalog: catalog_name.clone(),
schema: schema_name.clone(),
Expand Down
36 changes: 22 additions & 14 deletions src/catalog/src/local/manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,24 +117,28 @@ impl LocalCatalogManager {

async fn init_system_catalog(&self) -> Result<()> {
let system_schema = Arc::new(MemorySchemaProvider::new());
system_schema.register_table_sync(
let _ = system_schema.register_table_sync(
SYSTEM_CATALOG_TABLE_NAME.to_string(),
self.system.information_schema.system.clone(),
)?;
let system_catalog = Arc::new(MemoryCatalogProvider::new());
system_catalog.register_schema_sync(INFORMATION_SCHEMA_NAME.to_string(), system_schema)?;
self.catalogs
let _ = system_catalog
.register_schema_sync(INFORMATION_SCHEMA_NAME.to_string(), system_schema)?;
let _ = self
.catalogs
.register_catalog_sync(SYSTEM_CATALOG_NAME.to_string(), system_catalog)?;

let default_catalog = Arc::new(MemoryCatalogProvider::new());
let default_schema = Arc::new(MemorySchemaProvider::new());

// Add numbers table for test
let table = Arc::new(NumbersTable::default());
default_schema.register_table_sync("numbers".to_string(), table)?;
let _ = default_schema.register_table_sync("numbers".to_string(), table)?;

default_catalog.register_schema_sync(DEFAULT_SCHEMA_NAME.to_string(), default_schema)?;
self.catalogs
let _ = default_catalog
.register_schema_sync(DEFAULT_SCHEMA_NAME.to_string(), default_schema)?;
let _ = self
.catalogs
.register_catalog_sync(DEFAULT_CATALOG_NAME.to_string(), default_catalog)?;
Ok(())
}
Expand Down Expand Up @@ -207,14 +211,15 @@ impl LocalCatalogManager {
for entry in entries {
match entry {
Entry::Catalog(c) => {
self.catalogs.register_catalog_if_absent(
let _ = self.catalogs.register_catalog_if_absent(
c.catalog_name.clone(),
Arc::new(MemoryCatalogProvider::new()),
);
info!("Register catalog: {}", c.catalog_name);
}
Entry::Schema(s) => {
self.catalogs
let _ = self
.catalogs
.catalog(&s.catalog_name)
.await?
.context(CatalogNotFoundSnafu {
Expand Down Expand Up @@ -291,7 +296,7 @@ impl LocalCatalogManager {
),
})?;

schema.register_table(t.table_name.clone(), option).await?;
let _ = schema.register_table(t.table_name.clone(), option).await?;
Ok(())
}
}
Expand Down Expand Up @@ -360,7 +365,8 @@ impl CatalogManager for LocalCatalogManager {
} else {
let engine = request.table.table_info().meta.engine.to_string();
// table does not exist
self.system
let _ = self
.system
.register_table(
catalog_name.clone(),
schema_name.clone(),
Expand All @@ -369,7 +375,7 @@ impl CatalogManager for LocalCatalogManager {
engine,
)
.await?;
schema
let _ = schema
.register_table(request.table_name, request.table)
.await?;
increment_gauge!(
Expand Down Expand Up @@ -425,7 +431,8 @@ impl CatalogManager for LocalCatalogManager {

let engine = old_table.table_info().meta.engine.to_string();
// rename table in system catalog
self.system
let _ = self
.system
.register_table(
catalog_name.clone(),
schema_name.clone(),
Expand Down Expand Up @@ -497,10 +504,11 @@ impl CatalogManager for LocalCatalogManager {
schema: schema_name,
}
);
self.system
let _ = self
.system
.register_schema(request.catalog, schema_name.clone())
.await?;
catalog
let _ = catalog
.register_schema(request.schema, Arc::new(MemorySchemaProvider::new()))
.await?;

Expand Down
45 changes: 22 additions & 23 deletions src/catalog/src/local/memory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ impl Default for MemoryCatalogManager {
catalogs: Default::default(),
};
let default_catalog = Arc::new(MemoryCatalogProvider::new());
manager
let _ = manager
.register_catalog_sync("greptime".to_string(), default_catalog.clone())
.unwrap();
default_catalog
let _ = default_catalog
.register_schema_sync("public".to_string(), Arc::new(MemorySchemaProvider::new()))
.unwrap();
manager
Expand Down Expand Up @@ -147,7 +147,7 @@ impl CatalogManager for MemoryCatalogManager {
.context(CatalogNotFoundSnafu {
catalog_name: &request.catalog,
})?;
catalog
let _ = catalog
.register_schema(request.schema, Arc::new(MemorySchemaProvider::new()))
.await?;
increment_gauge!(crate::metrics::METRIC_CATALOG_MANAGER_SCHEMA_COUNT, 1.0);
Expand Down Expand Up @@ -214,7 +214,7 @@ impl MemoryCatalogManager {
match entry {
Entry::Occupied(v) => Some(v.get().clone()),
Entry::Vacant(v) => {
v.insert(catalog);
let _ = v.insert(catalog);
None
}
}
Expand Down Expand Up @@ -346,7 +346,7 @@ impl MemorySchemaProvider {
return TableExistsSnafu { table: e.key() }.fail();
}
};
e.insert(table.clone());
let _ = e.insert(table.clone());
Ok(table)
}

Expand Down Expand Up @@ -428,10 +428,10 @@ mod tests {
.unwrap()
.unwrap();

default_schema
assert!(default_schema
.register_table("numbers".to_string(), Arc::new(NumbersTable::default()))
.await
.unwrap();
.is_ok());

let table = default_schema.table("numbers").await.unwrap();
assert!(table.is_some());
Expand All @@ -443,7 +443,7 @@ mod tests {
let provider = MemorySchemaProvider::new();
let table_name = "numbers";
assert!(!provider.table_exist_sync(table_name).unwrap());
provider.deregister_table_sync(table_name).unwrap();
assert!(provider.deregister_table_sync(table_name).is_ok());
let test_table = NumbersTable::default();
// register table successfully
assert!(provider
Expand Down Expand Up @@ -472,13 +472,13 @@ mod tests {

// rename test table
let new_table_name = "numbers";
provider
assert!(provider
.rename_table_sync(table_name, new_table_name.to_string())
.unwrap();
.is_ok());

// test old table name not exist
assert!(!provider.table_exist_sync(table_name).unwrap());
provider.deregister_table_sync(table_name).unwrap();
assert!(provider.deregister_table_sync(table_name).is_ok());

// test new table name exists
assert!(provider.table_exist_sync(new_table_name).unwrap());
Expand Down Expand Up @@ -549,14 +549,16 @@ mod tests {
Arc::new(MemoryCatalogProvider::new())
)
.is_none());
list.register_catalog_if_absent(
"test_catalog".to_string(),
Arc::new(MemoryCatalogProvider::new()),
)
.unwrap();
list.as_any()
assert!(list
.register_catalog_if_absent(
"test_catalog".to_string(),
Arc::new(MemoryCatalogProvider::new()),
)
.is_some());
assert!(list
.as_any()
.downcast_ref::<MemoryCatalogManager>()
.unwrap();
.is_some());
}

#[tokio::test]
Expand All @@ -575,18 +577,15 @@ mod tests {
table_id: 2333,
table: Arc::new(NumbersTable::default()),
};
catalog.register_table(register_table_req).await.unwrap();
assert!(catalog.register_table(register_table_req).await.is_ok());
assert!(schema.table_exist("numbers").await.unwrap());

let deregister_table_req = DeregisterTableRequest {
catalog: DEFAULT_CATALOG_NAME.to_string(),
schema: DEFAULT_SCHEMA_NAME.to_string(),
table_name: "numbers".to_string(),
};
catalog
.deregister_table(deregister_table_req)
.await
.unwrap();
assert!(catalog.deregister_table(deregister_table_req).await.is_ok());
assert!(!schema.table_exist("numbers").await.unwrap());
}
}
2 changes: 1 addition & 1 deletion src/catalog/src/remote/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ impl KvBackend for MetaKvBackend {

async fn move_value(&self, from_key: &[u8], to_key: &[u8]) -> Result<()> {
let req = MoveValueRequest::new(from_key, to_key);
self.client.move_value(req).await.context(MetaSrvSnafu)?;
let _ = self.client.move_value(req).await.context(MetaSrvSnafu)?;
Ok(())
}

Expand Down
Loading

0 comments on commit e2fb357

Please sign in to comment.