Skip to content

Commit c9ef4f0

Browse files
manlgemanlge
committed
using if let instead of unwrap
1 parent 11e31b3 commit c9ef4f0

File tree

4 files changed

+105
-215
lines changed

4 files changed

+105
-215
lines changed

‎Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ edition = "2021"
2020
license = "Apache-2.0"
2121
readme = "README.md"
2222
description = "Rust client library for Apache IoTDB"
23-
keywords = ["iotdb", "iotdb-client-rust"]
23+
keywords = ["iotdb", "iotdb-client-rust", "apache-iotdb"]
2424
repository = "https://github.com/manlge/iotdb-client-rs.git"
2525

2626
[dependencies]

‎README.md

Lines changed: 5 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -77,32 +77,29 @@ use iotdb_client_rs::client::{MeasurementSchema, RowRecord, Session, Tablet, Val
7777
use iotdb_client_rs::protocal::{TSCompressionType, TSDataType, TSEncoding};
7878
use prettytable::{cell, Row, Table};
7979

80-
fn main() -> Result<(), Box<dyn Error>> {
80+
fn main() {
81+
run().expect("failed to run session_example.")
82+
}
83+
84+
fn run() -> Result<(), Box<dyn Error>> {
8185
let config = Config {
8286
host: String::from("127.0.0.1"),
8387
port: 6667,
8488
username: String::from("root"),
8589
password: String::from("root"),
8690
..Default::default()
8791
};
88-
89-
//rpc session
9092
let mut session = RpcSession::new(&config)?;
9193
session.open()?;
92-
9394
let tz = session.get_time_zone()?;
9495
if tz != "Asia/Shanghai" {
9596
session.set_time_zone("Asia/Shanghai")?;
9697
}
97-
9898
session.set_storage_group("root.ln1")?;
9999
session.delete_storage_group("root.ln1")?;
100-
101100
session.set_storage_group("root.ln1")?;
102101
session.set_storage_group("root.ln2")?;
103102
session.delete_storage_groups(vec!["root.ln1", "root.ln2"])?;
104-
105-
//create_timeseries
106103
session.create_timeseries(
107104
"root.sg_rs.dev2.status",
108105
TSDataType::Float,
@@ -114,8 +111,6 @@ fn main() -> Result<(), Box<dyn Error>> {
114111
None,
115112
)?;
116113
session.delete_timeseries(vec!["root.sg_rs.dev2.status"])?;
117-
118-
//insert_record
119114
session.insert_record(
120115
"root.sg_rs.dev5",
121116
vec!["online", "desc"],
@@ -124,8 +119,6 @@ fn main() -> Result<(), Box<dyn Error>> {
124119
false,
125120
)?;
126121
session.delete_timeseries(vec!["root.sg_rs.dev5.online", "root.sg_rs.dev5.desc"])?;
127-
128-
//insert_records
129122
session.insert_records(
130123
vec!["root.sg_rs.dev1"],
131124
vec![vec![
@@ -154,8 +147,6 @@ fn main() -> Result<(), Box<dyn Error>> {
154147
"root.sg_rs.dev1.description",
155148
"root.sg_rs.dev1.status",
156149
])?;
157-
158-
//create_multi_timeseries
159150
session.create_multi_timeseries(
160151
vec!["root.sg3.dev1.temperature", "root.sg3.dev1.desc"],
161152
vec![TSDataType::Float, TSDataType::Text],
@@ -167,8 +158,6 @@ fn main() -> Result<(), Box<dyn Error>> {
167158
None,
168159
)?;
169160
session.delete_timeseries(vec!["root.sg3.dev1.temperature", "root.sg3.dev1.desc"])?;
170-
171-
//delete_timeseries
172161
session.insert_string_record(
173162
"root.sg_rs.wf02.wt02",
174163
vec!["id", "location"],
@@ -180,8 +169,6 @@ fn main() -> Result<(), Box<dyn Error>> {
180169
"root.sg_rs.wf02.wt02.id",
181170
"root.sg_rs.wf02.wt02.location",
182171
])?;
183-
184-
//insert_records_of_one_device
185172
session.insert_records_of_one_device(
186173
"root.sg_rs.dev0",
187174
vec![
@@ -202,27 +189,18 @@ fn main() -> Result<(), Box<dyn Error>> {
202189
],
203190
false,
204191
)?;
205-
206-
//tablet
207192
let mut ts = Local::now().timestamp_millis();
208-
209193
let mut tablet1 = create_tablet(5, ts);
210194
tablet1.sort();
211195
ts += 5;
212-
213196
let mut tablet2 = create_tablet(10, ts);
214197
ts += 10;
215-
216198
let mut tablet3 = create_tablet(2, ts);
217-
218199
tablet1.sort();
219200
session.insert_tablet(&tablet1)?;
220-
221201
tablet2.sort();
222202
tablet3.sort();
223203
session.insert_tablets(vec![&tablet2, &tablet3])?;
224-
225-
//delete_data
226204
session.insert_records_of_one_device(
227205
"root.sg_rs.dev1",
228206
vec![1, 16],
@@ -231,34 +209,7 @@ fn main() -> Result<(), Box<dyn Error>> {
231209
true,
232210
)?;
233211
session.delete_data(vec!["root.sg_rs.dev1.status"], 1, 16)?;
234-
235212
let dataset = session.execute_query_statement("select * from root.sg_rs.device2", None)?;
236-
237-
// Get columns, column types and values from the data set
238-
// For example:
239-
// dataset
240-
// .get_column_names()
241-
// .iter()
242-
// .for_each(|c| print!("{}\t", c));
243-
// print!("\n");
244-
// dataset
245-
// .get_data_types()
246-
// .iter()
247-
// .for_each(|c| print!("{:?}\t", c));
248-
// print!("\n");
249-
// dataset.for_each(|r| {
250-
// r.values.iter().for_each(|v| match v {
251-
// Value::Bool(v) => print!("{}\t", v),
252-
// Value::Int32(v) => print!("{}\t", v),
253-
// Value::Int64(v) => print!("{}\t", v),
254-
// Value::Float(v) => print!("{}\t", v),
255-
// Value::Double(v) => print!("{}\t", v),
256-
// Value::Text(v) => print!("{}\t", v),
257-
// Value::Null => print!("null\t"),
258-
// });
259-
// print!("\n");
260-
// });
261-
262213
let mut table = Table::new();
263214
table.set_titles(Row::new(
264215
dataset
@@ -273,10 +224,6 @@ fn main() -> Result<(), Box<dyn Error>> {
273224
));
274225
});
275226
table.printstd();
276-
277-
// let timestamps: Vec<i64> = dataset.map(|r| r.timestamp).collect();
278-
// let count = dataset.count();
279-
280227
let dataset = session.execute_statement("show timeseries", None)?;
281228
let mut table = Table::new();
282229
table.set_titles(Row::new(
@@ -292,14 +239,11 @@ fn main() -> Result<(), Box<dyn Error>> {
292239
));
293240
});
294241
table.printstd();
295-
296-
//execute_raw_data_query
297242
session.execute_batch_statement(vec![
298243
"insert into root.sg_rs.dev6(time,s5) values(1,true)",
299244
"insert into root.sg_rs.dev6(time,s5) values(2,true)",
300245
"insert into root.sg_rs.dev6(time,s5) values(3,true)",
301246
])?;
302-
303247
let dataset = session.execute_raw_data_query(
304248
vec![
305249
"root.sg_rs.device2.restart_count",
@@ -323,15 +267,12 @@ fn main() -> Result<(), Box<dyn Error>> {
323267
));
324268
});
325269
table.printstd();
326-
327270
if let Some(dataset) =
328271
session.execute_update_statement("delete timeseries root.sg_rs.dev1.*")?
329272
{
330273
dataset.for_each(|r| println!("timestamp: {} {:?}", r.timestamp, r.values));
331274
}
332-
333275
session.close()?;
334-
335276
Ok(())
336277
}
337278

‎examples/session_example.rs

Lines changed: 5 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -28,32 +28,29 @@ use iotdb_client_rs::client::{MeasurementSchema, RowRecord, Session, Tablet, Val
2828
use iotdb_client_rs::protocal::{TSCompressionType, TSDataType, TSEncoding};
2929
use prettytable::{cell, Row, Table};
3030

31-
fn main() -> Result<(), Box<dyn Error>> {
31+
fn main() {
32+
run().expect("failed to run session_example.")
33+
}
34+
35+
fn run() -> Result<(), Box<dyn Error>> {
3236
let config = Config {
3337
host: String::from("127.0.0.1"),
3438
port: 6667,
3539
username: String::from("root"),
3640
password: String::from("root"),
3741
..Default::default()
3842
};
39-
40-
//rpc session
4143
let mut session = RpcSession::new(&config)?;
4244
session.open()?;
43-
4445
let tz = session.get_time_zone()?;
4546
if tz != "Asia/Shanghai" {
4647
session.set_time_zone("Asia/Shanghai")?;
4748
}
48-
4949
session.set_storage_group("root.ln1")?;
5050
session.delete_storage_group("root.ln1")?;
51-
5251
session.set_storage_group("root.ln1")?;
5352
session.set_storage_group("root.ln2")?;
5453
session.delete_storage_groups(vec!["root.ln1", "root.ln2"])?;
55-
56-
//create_timeseries
5754
session.create_timeseries(
5855
"root.sg_rs.dev2.status",
5956
TSDataType::Float,
@@ -65,8 +62,6 @@ fn main() -> Result<(), Box<dyn Error>> {
6562
None,
6663
)?;
6764
session.delete_timeseries(vec!["root.sg_rs.dev2.status"])?;
68-
69-
//insert_record
7065
session.insert_record(
7166
"root.sg_rs.dev5",
7267
vec!["online", "desc"],
@@ -75,8 +70,6 @@ fn main() -> Result<(), Box<dyn Error>> {
7570
false,
7671
)?;
7772
session.delete_timeseries(vec!["root.sg_rs.dev5.online", "root.sg_rs.dev5.desc"])?;
78-
79-
//insert_records
8073
session.insert_records(
8174
vec!["root.sg_rs.dev1"],
8275
vec![vec![
@@ -105,8 +98,6 @@ fn main() -> Result<(), Box<dyn Error>> {
10598
"root.sg_rs.dev1.description",
10699
"root.sg_rs.dev1.status",
107100
])?;
108-
109-
//create_multi_timeseries
110101
session.create_multi_timeseries(
111102
vec!["root.sg3.dev1.temperature", "root.sg3.dev1.desc"],
112103
vec![TSDataType::Float, TSDataType::Text],
@@ -118,8 +109,6 @@ fn main() -> Result<(), Box<dyn Error>> {
118109
None,
119110
)?;
120111
session.delete_timeseries(vec!["root.sg3.dev1.temperature", "root.sg3.dev1.desc"])?;
121-
122-
//delete_timeseries
123112
session.insert_string_record(
124113
"root.sg_rs.wf02.wt02",
125114
vec!["id", "location"],
@@ -131,8 +120,6 @@ fn main() -> Result<(), Box<dyn Error>> {
131120
"root.sg_rs.wf02.wt02.id",
132121
"root.sg_rs.wf02.wt02.location",
133122
])?;
134-
135-
//insert_records_of_one_device
136123
session.insert_records_of_one_device(
137124
"root.sg_rs.dev0",
138125
vec![
@@ -153,27 +140,18 @@ fn main() -> Result<(), Box<dyn Error>> {
153140
],
154141
false,
155142
)?;
156-
157-
//tablet
158143
let mut ts = Local::now().timestamp_millis();
159-
160144
let mut tablet1 = create_tablet(5, ts);
161145
tablet1.sort();
162146
ts += 5;
163-
164147
let mut tablet2 = create_tablet(10, ts);
165148
ts += 10;
166-
167149
let mut tablet3 = create_tablet(2, ts);
168-
169150
tablet1.sort();
170151
session.insert_tablet(&tablet1)?;
171-
172152
tablet2.sort();
173153
tablet3.sort();
174154
session.insert_tablets(vec![&tablet2, &tablet3])?;
175-
176-
//delete_data
177155
session.insert_records_of_one_device(
178156
"root.sg_rs.dev1",
179157
vec![1, 16],
@@ -182,34 +160,7 @@ fn main() -> Result<(), Box<dyn Error>> {
182160
true,
183161
)?;
184162
session.delete_data(vec!["root.sg_rs.dev1.status"], 1, 16)?;
185-
186163
let dataset = session.execute_query_statement("select * from root.sg_rs.device2", None)?;
187-
188-
// Get columns, column types and values from the data set
189-
// For example:
190-
// dataset
191-
// .get_column_names()
192-
// .iter()
193-
// .for_each(|c| print!("{}\t", c));
194-
// print!("\n");
195-
// dataset
196-
// .get_data_types()
197-
// .iter()
198-
// .for_each(|c| print!("{:?}\t", c));
199-
// print!("\n");
200-
// dataset.for_each(|r| {
201-
// r.values.iter().for_each(|v| match v {
202-
// Value::Bool(v) => print!("{}\t", v),
203-
// Value::Int32(v) => print!("{}\t", v),
204-
// Value::Int64(v) => print!("{}\t", v),
205-
// Value::Float(v) => print!("{}\t", v),
206-
// Value::Double(v) => print!("{}\t", v),
207-
// Value::Text(v) => print!("{}\t", v),
208-
// Value::Null => print!("null\t"),
209-
// });
210-
// print!("\n");
211-
// });
212-
213164
let mut table = Table::new();
214165
table.set_titles(Row::new(
215166
dataset
@@ -224,10 +175,6 @@ fn main() -> Result<(), Box<dyn Error>> {
224175
));
225176
});
226177
table.printstd();
227-
228-
// let timestamps: Vec<i64> = dataset.map(|r| r.timestamp).collect();
229-
// let count = dataset.count();
230-
231178
let dataset = session.execute_statement("show timeseries", None)?;
232179
let mut table = Table::new();
233180
table.set_titles(Row::new(
@@ -243,14 +190,11 @@ fn main() -> Result<(), Box<dyn Error>> {
243190
));
244191
});
245192
table.printstd();
246-
247-
//execute_raw_data_query
248193
session.execute_batch_statement(vec![
249194
"insert into root.sg_rs.dev6(time,s5) values(1,true)",
250195
"insert into root.sg_rs.dev6(time,s5) values(2,true)",
251196
"insert into root.sg_rs.dev6(time,s5) values(3,true)",
252197
])?;
253-
254198
let dataset = session.execute_raw_data_query(
255199
vec![
256200
"root.sg_rs.device2.restart_count",
@@ -274,15 +218,12 @@ fn main() -> Result<(), Box<dyn Error>> {
274218
));
275219
});
276220
table.printstd();
277-
278221
if let Some(dataset) =
279222
session.execute_update_statement("delete timeseries root.sg_rs.dev1.*")?
280223
{
281224
dataset.for_each(|r| println!("timestamp: {} {:?}", r.timestamp, r.values));
282225
}
283-
284226
session.close()?;
285-
286227
Ok(())
287228
}
288229

0 commit comments

Comments
 (0)