fix: conf issue

Author: francis-du

src/cmd.rs

@@ -40,8 +40,8 @@ impl Cli {
                 match sub_cmd {
                     // exec sql form file
                     SubCmd::File { file_path } => {
-                        if let Some(file_path) = file_path {
-                            common::exec_batch_from_file(conf, file_path);
+                        if let Some(file) = file_path {
+                            common::exec_batch_from_file(conf, file);
                         }
                     }
                     SubCmd::Usage => sub_cmd.usage(),
@@ -57,6 +57,7 @@ impl Cli {
     /// Set session conf
     pub fn session_conf(&self) -> Config {
         let Cli {
+            dev,
             host,
             port,
             user,
@@ -68,30 +69,34 @@ impl Cli {
         } = self;
 
         let mut builder = ConfigBuilder::new();
-        // enable debug mode
-        builder.debug(*debug);
 
-        // set endpoint
-        if let Some(endpoint) = endpoint {
-            let endpoint = endpoint.as_str().parse::<Endpoint>().unwrap();
-            builder.endpoint(endpoint.host.as_str(), endpoint.port.as_str());
-        } else if let Some(host) = host {
-            if let Some(port) = port {
-                builder.endpoint(host.as_str(), port.as_str());
-            }
+        // timezone
+        if let Some(timezone) = timezone {
+            builder.time_zone(timezone.as_str());
         }
 
+        // enable debug mode
+        builder.debug(*debug);
+
         // user and password
         if let Some(user) = user {
-            if let Some(password) = password {
-                builder.user(user.as_str());
-                builder.password(password.as_str());
-            }
+            builder.user(user.as_str());
+        }
+        if let Some(password) = password {
+            builder.password(password.as_str());
         }
 
-        // timezone
-        if let Some(timezone) = timezone {
-            builder.time_zone(timezone.as_str());
+        // set endpoint
+        if host.is_some() && port.is_some() {
+            builder.endpoint(
+                host.as_ref().unwrap().as_str(),
+                port.as_ref().unwrap().as_str(),
+            );
+        } else if let Some(endpoint) = endpoint {
+            let endpoint = endpoint.as_str().parse::<Endpoint>().unwrap();
+            builder.endpoint(endpoint.host.as_str(), endpoint.port.as_str());
+        } else if *dev {
+            builder.endpoint("119.84.128.59", "6667");
         }
 
         builder.build()

src/opt.rs

@@ -2,11 +2,15 @@ use crate::{ASCII_NAME, AUTHORS, PKG_NAME};
 use structopt::StructOpt;
 
 #[derive(Debug, Clone, StructOpt)]
-#[structopt(name = format ! ("{}\nAuthor: {}\nVersion: {}", ASCII_NAME, AUTHORS, PKG_NAME))]
+#[structopt(name = format!("{}\nAuthor: {}\nVersion: {}", ASCII_NAME, AUTHORS, PKG_NAME))]
 pub struct Cli {
     /// Execute single sql, eg: `iotdb "show storage group"`
     pub sql: Option<String>,
 
+    /// Dev server
+    #[structopt(long)]
+    pub dev: bool,
+
     /// Execute batch form sql file, eg: `iotdb -f ddl.sql`
     #[structopt(short = "f", long)]
     pub file: Option<String>,
@@ -51,6 +55,7 @@ impl Cli {
 }
 
 #[derive(Debug, Clone, StructOpt)]
+#[structopt(name = format ! ("{}\nAuthor: {}\nVersion: {}", ASCII_NAME, AUTHORS, PKG_NAME))]
 pub enum SubCmd {
     /// Execute batch form sql file, eg: `iotdb file ddl.sql`
     File { file_path: Option<String> },
@@ -64,13 +69,13 @@ pub enum SubCmd {
         export: Option<String>,
     },
 
-    /// Load TsFile util(TODO)
+    /// Load TsFile util (TODO)
     Load,
 
     /// Print usage info
     Usage,
 
-    /// Update binary(TODO)
+    /// Update binary (TODO)
     Update,
 
     /// Prints version information

src/static/usage_info

@@ -1,49 +1,49 @@
-Usage info:
-    DDL & DQL:
+usage info:
+    ddl & dql:
         01. `set storage group to root.ln`
         02. `show storage group` | `show storage group root.*`
-        03. `DELETE STORAGE GROUP root.ln` | `DELETE STORAGE GROUP root.*`
-        04. `create timeseries root.ln.wf01.wt01.status with datatype=BOOLEAN,encoding=PLAIN`
-        05. `CREATE ALIGNED TIMESERIES root.ln.wf01.GPS(latitude FLOAT encoding=PLAIN compressor=SNAPPY, longitude FLOAT encoding=PLAIN compressor=SNAPPY)`
+        03. `delete storage group root.ln` | `delete storage group root.*`
+        04. `create timeseries root.ln.wf01.wt01.status with datatype=boolean,encoding=plain`
+        05. `create aligned timeseries root.ln.wf01.gps(latitude float encoding=plain compressor=snappy, longitude float encoding=plain compressor=snappy)`
         06. `delete timeseries root.ln.wf01.wt01.status` | `delete timeseries root.ln.wf01.wt01.*`
         07. `show timeseries root.*`
-        08. `COUNT TIMESERIES root.*`
-        09. `SHOW CHILD PATHS pathPattern`
-        10. `SHOW CHILD NODES pathPattern`
-        11. `COUNT NODES root.** LEVEL=2`
+        08. `count timeseries root.*`
+        09. `show child paths pathpattern`
+        10. `show child nodes pathpattern`
+        11. `count nodes root.** level=2`
         12. `show devices` | `show devices root.ln.*`
-        13. `create schema template temp1(GPS(lat FLOAT encoding=Gorilla, lon FLOAT encoding=Gorilla) compression=SNAPPY, status BOOLEAN encoding=PLAIN compression=SNAPPY)`
+        13. `create schema template temp1(gps(lat float encoding=gorilla, lon float encoding=gorilla) compression=snappy, status boolean encoding=plain compression=snappy)`
         14. `set schema template temp1 to root.ln.wf01`
         15. `unset schema template temp1 from root.beijing`
         16. `set ttl to root.ln 3600000`
         17. `unset ttl to root.ln`
-        18. `SHOW ALL TTL` | `SHOW TTL ON StorageGroupNames`
-    DML:
+        18. `show all ttl` | `show ttl on storagegroupnames`
+    dml:
         01. `insert into root.ln.wf02.wt02(timestamp,status) values(1,true)`
-        02. `select temperature from root.ln.wf01.wt01 where time < 2017-11-01T00:08:00.000`
+        02. `select temperature from root.ln.wf01.wt01 where time < 2017-11-01t00:08:00.000`
         03. `select s1, - s1, s2, + s2, s1 + s2, s1 - s2, s1 * s2, s1 / s2, s1 % s2 from root.sg.d1`
         04. `select count(status) from root.ln.wf01.wt01`
-        05. `select <path> from <prefixPath> where time = <T> fill(<data_type>[previous, <before_range>], …)`
-        06. `select last <Path> [COMMA <Path>]* from < PrefixPath > [COMMA < PrefixPath >]* <WhereClause>`
+        05. `select <path> from <prefixpath> where time = <t> fill(<data_type>[previous, <before_range>], …)`
+        06. `select last <path> [comma <path>]* from < prefixpath > [comma < prefixpath >]* <whereclause>`
         07. `select * from root.sg.device where value like '%cc%'`
         08. `select s1 as temperature, s2 as speed from root.ln.wf01.wt01`
         09. `select status, temperature from root.ln.wf01.wt01 limit 10`
-        10. `select * from root.ln.* where time <= 2017-11-01T00:01:00 WITHOUT NULL ANY`
-        11. `select * from root.ln.* where time <= 2017-11-01T00:01:00 align by device`
-        12. `delete from root.ln.wf02.wt02.status where time<=2017-11-01T16:26:00`
-        13. `delete from root.ln.wf02.wt02 where time <= 2017-11-01T16:26:00`
-        14. `DELETE PARTITION root.ln 0,1,2`
-    Other:
-        01. `FLUSH` | `FLUSH root.ln`
-        02. `MERGE` | `FULL MERGE`
-        03. `CLEAR CACHE`
-        04. `SET SYSTEM TO READONLY`
-        05. `CREATE SNAPSHOT FOR SCHEMA`
-        06. `KILL QUERY <queryId>`
-Useful links:
-    01. What is IoTDB: https://iotdb.apache.org/UserGuide/Master/IoTDB-Introduction/What-is-IoTDB.html
-    02. SQL guide: https://iotdb.apache.org/UserGuide/Master/IoTDB-SQL-Language/DDL-Data-Definition-Language.html
-    03. Data concept: https://iotdb.apache.org/UserGuide/Master/Data-Concept/Data-Model-and-Terminology.html
-    04. Advanced features: https://iotdb.apache.org/UserGuide/Master/Advanced-Features/UDF-User-Defined-Function.html
-    04. About iotdb-rs: https://github.com/francis-du/iotdb-rs
-    05. About iotdb-cli: https://github.com/francis-du/iotdb-cli
+        10. `select * from root.ln.* where time <= 2017-11-01t00:01:00 without null any`
+        11. `select * from root.ln.* where time <= 2017-11-01t00:01:00 align by device`
+        12. `delete from root.ln.wf02.wt02.status where time<=2017-11-01t16:26:00`
+        13. `delete from root.ln.wf02.wt02 where time <= 2017-11-01t16:26:00`
+        14. `delete partition root.ln 0,1,2`
+    other:
+        01. `flush` | `flush root.ln`
+        02. `merge` | `full merge`
+        03. `clear cache`
+        04. `set system to readonly`
+        05. `create snapshot for schema`
+        06. `kill query <queryid>`
+useful links:
+    01. what is iotdb: https://iotdb.apache.org/userguide/master/iotdb-introduction/what-is-iotdb.html
+    02. sql guide: https://iotdb.apache.org/userguide/master/iotdb-sql-language/ddl-data-definition-language.html
+    03. data concept: https://iotdb.apache.org/userguide/master/data-concept/data-model-and-terminology.html
+    04. advanced features: https://iotdb.apache.org/userguide/master/advanced-features/udf-user-defined-function.html
+    04. about iotdb-rs: https://github.com/francis-du/iotdb-rs
+    05. about iotdb-cli: https://github.com/francis-du/iotdb-cli