rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-05-26 01:40:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: replace result assertions (#1840)

Browse Source 
* s/assert!\((.*)\.is_ok\(\)\);/\1.unwrap\(\);/g

* s/assert!\((.*)\.is_some\(\)\);/\1.unwrap\(\);/g
This commit is contained in:
Lei, HUANG
2023-06-27 19:14:48 +08:00
committed by GitHub
parent b737a240de
commit f287d3115b
92 changed files with 269 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/storage/benches/wal/bench_decode.rs
View File

@@ -34,14 +34,12 @@ rows | protobuf | arrow |
fn encode_arrow(batch: &WriteBatch, dst: &mut Vec<u8>) {
let encoder = codec::PayloadEncoder::new();
let result = encoder.encode(batch.payload(), dst);
assert!(result.is_ok());
encoder.encode(batch.payload(), dst).unwrap();
}
fn decode_arrow(dst: &[u8], mutation_types: &[i32]) {
let decoder = codec::PayloadDecoder::new(mutation_types);
let result = decoder.decode(dst);
assert!(result.is_ok());
let _ = decoder.decode(dst).unwrap();
}
fn bench_wal_decode(c: &mut Criterion) {

3
src/storage/benches/wal/bench_encode.rs
View File

@@ -35,8 +35,7 @@ rows | protobuf | arrow |
fn encode_arrow(batch: &WriteBatch) {
let encoder = codec::PayloadEncoder::new();
let mut dst = vec![];
let result = encoder.encode(batch.payload(), &mut dst);
assert!(result.is_ok());
encoder.encode(batch.payload(), &mut dst).unwrap();
}
fn bench_wal_encode(c: &mut Criterion) {

6
src/storage/benches/wal/bench_wal.rs
View File

@@ -35,12 +35,10 @@ rows | protobuf | arrow |
fn codec_arrow(batch: &WriteBatch, mutation_types: &[i32]) {
let encoder = codec::PayloadEncoder::new();
let mut dst = vec![];
let result = encoder.encode(batch.payload(), &mut dst);
assert!(result.is_ok());
encoder.encode(batch.payload(), &mut dst).unwrap();
let decoder = codec::PayloadDecoder::new(mutation_types);
let result = decoder.decode(&dst);
assert!(result.is_ok());
let _ = decoder.decode(&dst).unwrap();
}
fn bench_wal_encode_decode(c: &mut Criterion) {

2
src/storage/src/engine.rs
View File

@@ -658,7 +658,7 @@ mod tests {
("ts".to_string(), tsv),
]);
wb.put(put_data).unwrap();
assert!(region.write(&WriteContext::default(), wb).await.is_ok());
let _ = region.write(&WriteContext::default(), wb).await.unwrap();
// Flush memtable to sst.
region.flush(&FlushContext::default()).await.unwrap();

8
src/storage/src/manifest/action.rs
View File

@@ -338,16 +338,16 @@ mod tests {
#[test]
fn test_region_manifest_compatibility() {
let region_edit = r#"{"region_version":0,"flushed_sequence":null,"files_to_add":[{"region_id":4402341478400,"file_name":"4b220a70-2b03-4641-9687-b65d94641208.parquet","time_range":[{"value":1451609210000,"unit":"Millisecond"},{"value":1451609520000,"unit":"Millisecond"}],"level":1}],"files_to_remove":[{"region_id":4402341478400,"file_name":"34b6ebb9-b8a5-4a4b-b744-56f67defad02.parquet","time_range":[{"value":1451609210000,"unit":"Millisecond"},{"value":1451609520000,"unit":"Millisecond"}],"level":0}]}"#;
assert!(serde_json::from_str::<RegionEdit>(region_edit).is_ok());
let _ = serde_json::from_str::<RegionEdit>(region_edit).unwrap();
let region_change = r#" {"committed_sequence":42,"metadata":{"id":0,"name":"region-0","columns":{"columns":[{"cf_id":0,"desc":{"id":2,"name":"k1","data_type":{"Int32":{}},"is_nullable":false,"is_time_index":false,"default_constraint":null,"comment":""}},{"cf_id":0,"desc":{"id":1,"name":"timestamp","data_type":{"Timestamp":{"Millisecond":null}},"is_nullable":false,"is_time_index":true,"default_constraint":null,"comment":""}},{"cf_id":1,"desc":{"id":3,"name":"v1","data_type":{"Float32":{}},"is_nullable":true,"is_time_index":false,"default_constraint":null,"comment":""}},{"cf_id":1,"desc":{"id":2147483649,"name":"__sequence","data_type":{"UInt64":{}},"is_nullable":false,"is_time_index":false,"default_constraint":null,"comment":""}},{"cf_id":1,"desc":{"id":2147483650,"name":"__op_type","data_type":{"UInt8":{}},"is_nullable":false,"is_time_index":false,"default_constraint":null,"comment":""}}],"row_key_end":2,"timestamp_key_index":1,"enable_version_column":false,"user_column_end":3},"column_families":{"column_families":[{"name":"default","cf_id":1,"column_index_start":2,"column_index_end":3}]},"version":0}}"#;
assert!(serde_json::from_str::<RegionChange>(region_change).is_ok());
let _ = serde_json::from_str::<RegionChange>(region_change).unwrap();
let region_remove = r#"{"region_id":42}"#;
assert!(serde_json::from_str::<RegionRemove>(region_remove).is_ok());
let _ = serde_json::from_str::<RegionRemove>(region_remove).unwrap();
let protocol_action = r#"{"min_reader_version":1,"min_writer_version":2}"#;
assert!(serde_json::from_str::<ProtocolAction>(protocol_action).is_ok());
let _ = serde_json::from_str::<ProtocolAction>(protocol_action).unwrap();
}
fn mock_file_meta() -> FileMeta {

4
src/storage/src/manifest/region.rs
View File

@@ -444,7 +444,7 @@ mod tests {
];
for action in actions {
assert!(manifest.update(action).await.is_ok());
let _ = manifest.update(action).await.unwrap();
}
assert!(manifest.last_checkpoint().await.unwrap().is_none());
assert_scan(manifest, 0, 3).await;
@@ -503,7 +503,7 @@ mod tests {
))]),
];
for action in actions {
assert!(manifest.update(action).await.is_ok());
let _ = manifest.update(action).await.unwrap();
}
assert_scan(manifest, 3, 2).await;

8
src/storage/src/manifest/storage.rs
View File

@@ -610,9 +610,9 @@ mod tests {
assert_eq!(3, v);
//delete (,4) logs and keep checkpoint 3.
assert!(log_store.delete_until(4, true).await.is_ok());
assert!(log_store.load_checkpoint(3).await.unwrap().is_some());
assert!(log_store.load_last_checkpoint().await.unwrap().is_some());
let _ = log_store.delete_until(4, true).await.unwrap();
let _ = log_store.load_checkpoint(3).await.unwrap().unwrap();
let _ = log_store.load_last_checkpoint().await.unwrap().unwrap();
let mut it = log_store.scan(0, 11).await.unwrap();
let (version, bytes) = it.next_log().await.unwrap().unwrap();
assert_eq!(4, version);
@@ -620,7 +620,7 @@ mod tests {
assert!(it.next_log().await.unwrap().is_none());
// delete all logs and checkpoints
assert!(log_store.delete_until(11, false).await.is_ok());
let _ = log_store.delete_until(11, false).await.unwrap();
assert!(log_store.load_checkpoint(3).await.unwrap().is_none());
assert!(log_store.load_last_checkpoint().await.unwrap().is_none());
let mut it = log_store.scan(0, 11).await.unwrap();

2
src/storage/src/memtable/tests.rs
View File

@@ -508,7 +508,7 @@ fn test_iter_after_none() {
};
let mut iter = ctx.memtable.iter(iter_ctx).unwrap();
assert!(iter.next().is_some());
let _ = iter.next().unwrap();
assert!(iter.next().is_none());
assert!(iter.next().is_none());
});

2
src/storage/src/region/tests.rs
View File

@@ -90,7 +90,7 @@ impl<S: LogStore> TesterBase<S> {
pub async fn checkpoint_manifest(&self) {
let manifest = &self.region.inner.manifest;
manifest.set_flushed_manifest_version(manifest.last_version() - 1);
assert!(manifest.do_checkpoint().await.unwrap().is_some());
let _ = manifest.do_checkpoint().await.unwrap().unwrap();
}
pub async fn close(&self) {

2
src/storage/src/region/tests/alter.rs
View File

@@ -288,7 +288,7 @@ fn check_schema_names(schema: &SchemaRef, names: &[&str]) {
for (idx, name) in names.iter().enumerate() {
assert_eq!(*name, schema.column_name_by_index(idx));
assert!(schema.column_schema_by_name(name).is_some());
let _ = schema.column_schema_by_name(name).unwrap();
}
}

2
src/storage/src/region/tests/projection.rs
View File

@@ -142,7 +142,7 @@ impl<S: LogStore> ProjectionTester<S> {
let put_data = new_put_data(len, key_start, ts_start, initial_value);
batch.put(put_data).unwrap();
assert!(self.region.write(&self.write_ctx, batch).await.is_ok());
let _ = self.region.write(&self.write_ctx, batch).await.unwrap();
}
async fn scan(&self, projection: Option<Vec<usize>>) -> Vec<Vec<i64>> {

4
src/storage/src/scheduler.rs
View File

@@ -443,8 +443,8 @@ mod tests {
handler,
);
assert!(scheduler.schedule(MockRequest { region_id: 1 }).is_ok());
assert!(scheduler.schedule(MockRequest { region_id: 2 }).is_ok());
let _ = scheduler.schedule(MockRequest { region_id: 1 }).unwrap();
let _ = scheduler.schedule(MockRequest { region_id: 2 }).unwrap();
tokio::time::timeout(Duration::from_secs(1), latch.wait())
.await

6
src/storage/src/write_batch/codec.rs
View File

@@ -167,8 +167,7 @@ mod tests {
let encoder = PayloadEncoder::new();
let mut dst = vec![];
let result = encoder.encode(batch.payload(), &mut dst);
assert!(result.is_ok());
encoder.encode(batch.payload(), &mut dst).unwrap();
let decoder = PayloadDecoder::new(&mutation_types);
let result = decoder.decode(&dst);
@@ -201,8 +200,7 @@ mod tests {
let encoder = PayloadEncoder::new();
let mut dst = vec![];
let result = encoder.encode(batch.payload(), &mut dst);
assert!(result.is_ok());
encoder.encode(batch.payload(), &mut dst).unwrap();
let decoder = PayloadDecoder::new(&mutation_types);
let result = decoder.decode(&dst);

2
src/storage/src/write_batch/compat.rs
View File

@@ -183,7 +183,7 @@ mod tests {
assert_eq!(schema_new, *batch.schema());
let mutation = &batch.payload().mutations[0];
assert!(mutation.record_batch.column_by_name("v0").is_some());
let _ = mutation.record_batch.column_by_name("v0").unwrap();
}
#[test]